diff --git a/python/ycm/base.py b/python/ycm/base.py
index 3cc22576..d0ffc648 100644
--- a/python/ycm/base.py
+++ b/python/ycm/base.py
@@ -171,7 +171,7 @@ def OverlapLength( left_string, right_string ):
       length += 1
 
 
-COMPATIBLE_WITH_CORE_VERSION = 15
+COMPATIBLE_WITH_CORE_VERSION = 16
 
 def CompatibleWithYcmCore():
   try:
diff --git a/third_party/ycmd b/third_party/ycmd
index 83ba51d2..97921b31 160000
--- a/third_party/ycmd
+++ b/third_party/ycmd
@@ -1 +1 @@
-Subproject commit 83ba51d2eed79a0e173a0bec3a49cfbe2617cabb
+Subproject commit 97921b31bcaeb03a2dd474318191254016bc4c8b