diff --git a/.travis.yml b/.travis.yml
index 8919cb43..680f0a14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,9 +34,9 @@ addons:
     packages:
      - cmake-data
      - cmake
-     # 4.9 is the first version of GCC with good enough C++11 support to build
+     # 4.8 is the first version of GCC with good enough C++11 support to build
      # ycmd.
-     - g++-4.9
+     - g++-4.8
      - ninja-build
      # Everything below is a Python build dep (though it depends on Python
      # version). We need them because pyenv builds Python.
diff --git a/ci/travis/travis_install.linux.sh b/ci/travis/travis_install.linux.sh
index 7124a4bc..b09d1ab1 100644
--- a/ci/travis/travis_install.linux.sh
+++ b/ci/travis/travis_install.linux.sh
@@ -5,8 +5,8 @@
 
 mkdir ${HOME}/bin
 
-ln -s /usr/bin/g++-4.9 ${HOME}/bin/c++
-ln -s /usr/bin/gcc-4.9 ${HOME}/bin/cc
+ln -s /usr/bin/g++-4.8 ${HOME}/bin/c++
+ln -s /usr/bin/gcc-4.8 ${HOME}/bin/cc
 
 export PATH=${HOME}/bin:${PATH}
 
diff --git a/third_party/ycmd b/third_party/ycmd
index 490b3ee2..64637740 160000
--- a/third_party/ycmd
+++ b/third_party/ycmd
@@ -1 +1 @@
-Subproject commit 490b3ee26d7930704743585ab1ac6f925dbc7202
+Subproject commit 6463774035e61a660ad9150a592b8829eb37fd10