diff --git a/DEPRECATED.md b/DEPRECATED.md
index cf4fbd97c6..bd1f31a389 100644
--- a/DEPRECATED.md
+++ b/DEPRECATED.md
@@ -40,7 +40,6 @@ ArangoDB and shouldn't be used if possible.
 * Foxx: the Foxx sessions option `jwt` has been removed entirely. Please use the `sesssions-jwt` app from the Foxx app store or use the `crypto` module's JWT functions directly.
 * Foxx: the Foxx sessions option `type` has been removed entirely. Please use the options `cookie` and `header` instead.
 * Foxx: the Foxx sessions option `sessionStorageApp` has been removed entirely. Please use the option `sessionStorage` instead.
-* The built-in support for CoffeeScript source files is deprecated, it will raise a warning if you use it. Please pre-compile CoffeeScript source files.
 * AQL: the AQL function `SKIPLIST` has been removed.
 * Simple queries: the following simple query functions are now deprecated: collection.near(), collection.within(), collection.geo(), collection.fulltext(), collection.range(), collection.closedRange(). It is recommended to replace calls to these functions with equivalent AQL queries, which are more flexible.
 * Simple queries: using negative values for SimpleQuery.skip() is not supported any longer.
@@ -51,10 +50,11 @@ ArangoDB and shouldn't be used if possible.
 * Foxx: the method `addInjector` of controllers is deprecated, it will raise a warning if you use it. Please use regular variables instead.
 * Foxx: the property `assets` in manifests has been removed entirely. Please use the `files` property and an external build tool instead.
 * Foxx: properties `setup` and `teardown` in manifests have been removed entirely. Please use the `scripts` property instead.
-* The built-in support for CoffeeScript source files has been removed entirely. Please pre-compile CoffeeScript source files.
 * Simple queries: the following simple query functions will be removed: collection.near(), collection.within(), collection.geo(), collection.fulltext(), collection.range(), collection.closedRange(). It is recommended to replace calls to these functions with equivalent AQL queries, which are more flexible.
+* The built-in support for CoffeeScript source files is deprecated, it will raise a warning if you use it. Please pre-compile CoffeeScript source files.
 
 
 ## 2.9
 * Foxx: the method `del` of controllers has been removed entirely. Please use the `delete` method instead.
 * Foxx: the method `addInjector` of controllers has been removed entirely. Please use regular variables instead.
+* The built-in support for CoffeeScript source files has been removed entirely. Please pre-compile CoffeeScript source files.
diff --git a/Documentation/Books/Users/Upgrading/UpgradingChanges27.mdpp b/Documentation/Books/Users/Upgrading/UpgradingChanges27.mdpp
index 08897d9307..b43c647f11 100644
--- a/Documentation/Books/Users/Upgrading/UpgradingChanges27.mdpp
+++ b/Documentation/Books/Users/Upgrading/UpgradingChanges27.mdpp
@@ -58,8 +58,6 @@ MyModel.prototype.schema = {/* ... */};
 
 The `assets` property is no longer supported in Foxx manifests and is scheduled to be removed in a future version of ArangoDB. The `files` property can still be used to serve static assets but it is recommended to use separate tooling to compile and bundle your assets.
 
-The support for loading and ad-hoc compiling CoffeeScript source files has been deprecated and will be removed as well. If you want to continue to write Foxx apps in CoffeeScript you should use a CoffeeScript compiler directly as part of your build process.
-
 !SUBSECTION Manifest scripts
 
 The properties `setup` and `teardown` have been moved into the `scripts` property map:
diff --git a/js/common/bootstrap/modules.js b/js/common/bootstrap/modules.js
index 53a611dec8..b193292774 100644
--- a/js/common/bootstrap/modules.js
+++ b/js/common/bootstrap/modules.js
@@ -396,7 +396,7 @@ Module._load = function(request, parent, isMain) {
   var filename = request;
   var dbModule = false;
   var match = request.match(/^\/?db:(\/(\/_modules)?)?(\/.+)/);
-  
+
   if (match) {
     dbModule = Module._resolveDbModule(match[3]);
     if (!dbModule) {
@@ -462,7 +462,6 @@ Module._resolveFilename = function(request, parent) {
   var resolvedModule = Module._resolveLookupPaths(request, parent);
   var id = resolvedModule[0];
   var paths = resolvedModule[1];
-	
 
   // look up the filename first, since that's the cache key.
   var filename = Module._findPath(request, paths);
@@ -600,7 +599,7 @@ Module._extensions['.json'] = function(module, filename) {
 
 Module._extensions['.coffee'] = function(module, filename) {
   require('org/arangodb/deprecated')(
-    '2.8',
+    '2.9',
     'CoffeeScript support is deprecated,'
     + ' please pre-compile CoffeeScript modules to JavaScript using external build tools.'
   );