diff --git a/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthenticationProvider.java b/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthenticationProvider.java
index 69af5b7ff..bf665b512 100644
--- a/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthenticationProvider.java
+++ b/extensions/guacamole-auth-noauth/src/main/java/org/apache/guacamole/auth/noauth/NoAuthenticationProvider.java
@@ -63,6 +63,7 @@ import org.xml.sax.helpers.XMLReaderFactory;
  *    </config>
  *  </configs>
  */
+@Deprecated
 public class NoAuthenticationProvider extends SimpleAuthenticationProvider {
 
     /**
@@ -115,6 +116,10 @@ public class NoAuthenticationProvider extends SimpleAuthenticationProvider {
      */
     public NoAuthenticationProvider() throws GuacamoleException {
         environment = new LocalEnvironment();
+        logger.warn("The \"NoAuth\" extension is **DEPRECATED**! This "
+                + "extension will be removed from the Guacamole codebase "
+                + "entirely in a future release. Please consider writing an "
+                + "extension using Guacamole's extension API instead.");
     }
 
     @Override
diff --git a/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json
index b57358a7c..16a3e24fa 100644
--- a/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json
@@ -2,7 +2,7 @@
 
     "guacamoleVersion" : "0.9.12-incubating",
 
-    "name"      : "Disabled Authentication",
+    "name"      : "Disabled Authentication (DEPRECATED)",
     "namespace" : "guac-noauth",
 
     "authProviders" : [