diff --git a/extensions/guacamole-auth-noauth/.gitignore b/extensions/guacamole-auth-noauth/.gitignore
new file mode 100644
index 000000000..2f7896d1d
--- /dev/null
+++ b/extensions/guacamole-auth-noauth/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/extensions/guacamole-auth-noauth/README.rst b/extensions/guacamole-auth-noauth/README.rst
new file mode 100644
index 000000000..f87c0225d
--- /dev/null
+++ b/extensions/guacamole-auth-noauth/README.rst
@@ -0,0 +1,57 @@
+guacamole-noauth
+================
+
+Remove login screen from the `Guacamole `_ web interface.
+
+Build
+-----
+
+- Download
+
+ ::
+
+ git clone http://git.deltalima.net/guacamole-noauth/
+
+- Compile
+
+ ::
+
+ cd extensions/guacamole-auth-noauth/
+ mvn package
+
+ These will create a new jar file `guacamole-noauth-VERSION.jar` in the
+ `target/` folder.
+
+
+Install
+-------
+
+- Copy `guacamole-noauth-VERSION.jar` in `webapps/guacamole/WEB-INF/lib/`. It
+ does not work if you copy the jar in `common/lib/` or `shared/lib/`.
+
+Configure
+---------
+
+- Edit the Guacamole configuration file (`/etc/guacamole/guacamole.properties`):
+
+ ::
+
+ # Hostname and port of guacamole proxy
+ guacd-hostname: localhost
+ guacd-port: 4822
+
+ auth-provider: net.sourceforge.guacamole.net.auth.noauth.NoAuthenticationProvider
+ noauth-config: /etc/guacamole/noauth-config.xml
+
+- Create a new file `/etc/gacamole/noauth-config.xml`:
+
+ ::
+
+
+
+
+
+
+
+
+- Restart Tomcat
diff --git a/extensions/guacamole-auth-noauth/doc/example-configuration-file.xml b/extensions/guacamole-auth-noauth/doc/example-configuration-file.xml
new file mode 100644
index 000000000..be02d89ae
--- /dev/null
+++ b/extensions/guacamole-auth-noauth/doc/example-configuration-file.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/extensions/guacamole-auth-noauth/doc/example-guacamole.properties b/extensions/guacamole-auth-noauth/doc/example-guacamole.properties
new file mode 100644
index 000000000..fc77dbcbf
--- /dev/null
+++ b/extensions/guacamole-auth-noauth/doc/example-guacamole.properties
@@ -0,0 +1,4 @@
+# Add these two lines to your guacamole.properties file
+
+auth-provider: net.sourceforge.guacamole.net.auth.noauth.NoAuthenticationProvider
+noauth-config: /etc/guacamole/noauth-config.xml
diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml
new file mode 100644
index 000000000..a85de167a
--- /dev/null
+++ b/extensions/guacamole-auth-noauth/pom.xml
@@ -0,0 +1,67 @@
+
+
+ 4.0.0
+ net.deltalima.guacamole
+ guacamole-noauth
+ jar
+ 0.8.0
+ guacamole-noauth
+ http://guacamole.sourceforge.net/
+
+
+ UTF-8
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 1.6
+ 1.6
+
+
+
+
+
+
+
+
+ org.slf4j
+ slf4j-api
+ 1.6.1
+
+
+ org.slf4j
+ slf4j-jcl
+ 1.6.1
+ runtime
+
+
+
+
+ net.sourceforge.guacamole
+ guacamole-common
+ 0.8.0
+
+
+
+
+ net.sourceforge.guacamole
+ guacamole-ext
+ 0.8.0
+
+
+
+
+
+
+ guac-dev
+ http://guac-dev.org/repo
+
+
+
+
diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java b/extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java
similarity index 100%
rename from guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java
rename to extensions/guacamole-auth-noauth/src/main/java/net/sourceforge/guacamole/net/auth/noauth/NoAuthenticationProvider.java