diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index 8e67ab405..340b5f4d9 100644
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -32,6 +32,26 @@
                 </configuration>
             </plugin>
 
+            <!-- Copy dependencies prior to packaging -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+                <executions>
+                    <execution>
+                        <id>unpack-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeScope>runtime</includeScope>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- Assembly plugin - for easy distribution -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -64,6 +84,7 @@
             <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.9.6</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Guacamole Extension API -->
@@ -71,6 +92,7 @@
             <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <version>0.9.6</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- JLDAP -->
diff --git a/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml b/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
index 9b0b27dde..59a416b70 100644
--- a/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
@@ -11,43 +11,29 @@
         <format>tar.gz</format>
     </formats>
 
-    <!-- Include docs and schema -->
+    <!-- Include docs, schema, and extension .jar -->
     <fileSets>
 
-            <!-- Include docs -->
-            <fileSet>
-                <directory>doc</directory>
-            </fileSet>
+        <!-- Include docs -->
+        <fileSet>
+            <directory>doc</directory>
+        </fileSet>
 
-            <!-- Include schema -->
-            <fileSet>
-                <outputDirectory>schema</outputDirectory>
-                <directory>schema</directory>
-            </fileSet>
+        <!-- Include schema -->
+        <fileSet>
+            <outputDirectory>schema</outputDirectory>
+            <directory>schema</directory>
+        </fileSet>
+
+        <!-- Include extension .jar -->
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </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>org.glyptodon.guacamole:guacamole-common</exclude>
-
-                <!-- Do not include guacamole-ext -->
-                <exclude>org.glyptodon.guacamole:guacamole-ext</exclude>
-
-            </excludes>
-        </dependencySet>
-    </dependencySets>
-
 </assembly>
diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml
index 4596d32d6..67899f164 100644
--- a/extensions/guacamole-auth-noauth/pom.xml
+++ b/extensions/guacamole-auth-noauth/pom.xml
@@ -32,6 +32,26 @@
                 </configuration>
             </plugin>
 
+            <!-- Copy dependencies prior to packaging -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
+                <executions>
+                    <execution>
+                        <id>unpack-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeScope>runtime</includeScope>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- Assembly plugin - for easy distribution -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -64,6 +84,7 @@
             <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.9.6</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Guacamole Extension API -->
@@ -71,6 +92,7 @@
             <groupId>org.glyptodon.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <version>0.9.6</version>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>
diff --git a/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
index 610749432..834d5beff 100644
--- a/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
@@ -11,7 +11,7 @@
         <format>tar.gz</format>
     </formats>
 
-    <!-- Include docs and schema -->
+    <!-- Include docs and extension .jar -->
     <fileSets>
 
         <!-- Include docs -->
@@ -19,29 +19,15 @@
             <directory>doc</directory>
         </fileSet>
 
+        <!-- Include extension .jar -->
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </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>org.glyptodon.guacamole:guacamole-common</exclude>
-
-                <!-- Do not include guacamole-ext -->
-                <exclude>org.glyptodon.guacamole:guacamole-ext</exclude>
-
-            </excludes>
-        </dependencySet>
-    </dependencySets>
-
 </assembly>