diff --git a/extensions/guacamole-auth-noauth/doc/example-guacamole.properties b/extensions/guacamole-auth-noauth/doc/example-guacamole.properties
deleted file mode 100644
index fc77dbcbf..000000000
--- a/extensions/guacamole-auth-noauth/doc/example-guacamole.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/doc/example-configuration-file.xml b/extensions/guacamole-auth-noauth/doc/example/noauth-config.xml
similarity index 100%
rename from extensions/guacamole-auth-noauth/doc/example-configuration-file.xml
rename to extensions/guacamole-auth-noauth/doc/example/noauth-config.xml
diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml
index 49327d4e1..9547e8b05 100644
--- a/extensions/guacamole-auth-noauth/pom.xml
+++ b/extensions/guacamole-auth-noauth/pom.xml
@@ -15,6 +15,7 @@
 
     <build>
         <plugins>
+
             <!-- Written for 1.6 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -24,10 +25,34 @@
                     <target>1.6</target>
                 </configuration>
             </plugin>
+
+            <!-- Assembly plugin - for easy distribution -->
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-5</version>
+                <configuration>
+                    <finalName>${project.artifactId}-${project.version}</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/main/assembly/dist.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-dist-archive</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
 
     <dependencies>
+
         <!-- SLF4J - logging -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -54,6 +79,7 @@
             <artifactId>guacamole-ext</artifactId>
             <version>0.8.1</version>
         </dependency>
+
     </dependencies>
 
 </project>
diff --git a/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
new file mode 100644
index 000000000..6d90e1c3a
--- /dev/null
+++ b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
@@ -0,0 +1,48 @@
+<assembly
+    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    
+    <id>dist</id>
+    <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
+
+    <!-- Output tar.gz -->
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+
+    <!-- Include docs and schema -->
+    <fileSets>
+
+            <!-- Include docs -->
+            <fileSet>
+                <outputDirectory>/</outputDirectory>
+                <directory>doc</directory>
+            </fileSet>
+
+    </fileSets>
+
+    <!-- Include self and all dependencies except guacamole-common 
+         and guacamole-ext -->
+    <dependencySets>
+        <dependencySet>
+
+            <outputDirectory>/lib</outputDirectory>
+            <scope>runtime</scope>
+            <unpack>false</unpack>
+            <useProjectArtifact>true</useProjectArtifact>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+
+            <excludes>
+
+                <!-- Do not include guacamole-common -->
+                <exclude>net.sourceforge.guacamole:guacamole-common</exclude>
+
+                <!-- Do not include guacamole-ext -->
+                <exclude>net.sourceforge.guacamole:guacamole-ext</exclude>
+
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+
+</assembly>