diff --git a/_faq/coala-will-apply-for-gsoc-2018.md b/_faq/coala-will-apply-for-gsoc-2018.md
new file mode 100644
index 00000000..529f4178
--- /dev/null
+++ b/_faq/coala-will-apply-for-gsoc-2018.md
@@ -0,0 +1,4 @@
+---
+question: "Will coala apply for Google Summer of Code 2018?"
+---
+Yes, coala will apply as an organisation for Google Summer of Code - 2018. You might read the [GSoC Timeline](https://developers.google.com/open-source/gsoc/timeline) to get an idea of how things will proceed.
diff --git a/_projects/editor-support.md b/_projects/editor-support.md
index 0d06c45a..1073894d 100644
--- a/_projects/editor-support.md
+++ b/_projects/editor-support.md
@@ -8,8 +8,7 @@ initiatives:
   - RGSoC
 issues:
   - "https://github.com/coala/coala-atom/issues/37"
-  - "https://github.com/coala/coala-emacs/issues/11"
-  - "https://github.com/coala/coala-eclipse/issues/25"
+  - "https://github.com/coala/coala-eclipse/issues/51"
   - "https://github.com/coala/coala-vim/issues/24"
   - "https://github.com/coala/coala-gedit/issues/5"
   - "https://github.com/coala/coala-sublime/issues/4"
@@ -46,7 +45,7 @@ For sublime, we'll be using the
 which is a plugin by itself.
 For atom, we have the apm testing architecture
 which does not require a GUI.
-For VI and emacs, we will most likely use a testing framework such as
+For VI, we will most likely use a testing framework such as
 [Vimcasts](https://github.com/kana/vim-vspec).
 For some editors like gedit, running tests is not easy and
 there is no api to do it. In such cases we  would want to use