diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml
index d1f5d0f4b..1b3b29a7f 100644
--- a/doc/guacamole-example/pom.xml
+++ b/doc/guacamole-example/pom.xml
@@ -36,6 +36,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
                 <configuration>
                     <overlays>
                         <overlay>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
index 4e38e1953..436cb6ca3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
@@ -38,25 +38,22 @@
                 </configuration>
             </plugin>
 
-            <!-- Assembly plugin - for easy distribution -->
+            <!-- Copy dependencies prior to packaging -->
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
                 <executions>
                     <execution>
-                        <id>jar-with-dependencies</id>
-                        <phase>package</phase>
+                        <id>unpack-dependencies</id>
+                        <phase>prepare-package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <finalName>extension/${project.artifactId}-${project.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptorRefs>
-                                <descriptorRef>jar-with-dependencies</descriptorRef>
-                            </descriptorRefs>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
                         </configuration>
-                    </execution>                    
+                    </execution>
                 </executions>
             </plugin>
 
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
index 2dbdc0acf..207348690 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
@@ -38,25 +38,22 @@
                 </configuration>
             </plugin>
 
-            <!-- Assembly plugin - for easy distribution -->
+            <!-- Copy dependencies prior to packaging -->
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.10</version>
                 <executions>
                     <execution>
-                        <id>jar-with-dependencies</id>
-                        <phase>package</phase>
+                        <id>unpack-dependencies</id>
+                        <phase>prepare-package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
-                            <finalName>extension/${project.artifactId}-${project.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptorRefs>
-                                <descriptorRef>jar-with-dependencies</descriptorRef>
-                            </descriptorRefs>
+                            <outputDirectory>${project.build.directory}/classes</outputDirectory>
                         </configuration>
-                    </execution>                    
+                    </execution>
                 </executions>
             </plugin>
 
diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml
index 3051f3e6d..3fb51f7e9 100644
--- a/extensions/guacamole-auth-jdbc/pom.xml
+++ b/extensions/guacamole-auth-jdbc/pom.xml
@@ -32,7 +32,7 @@
             <!-- Assembly plugin - for easy distribution -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
+                <version>2.5.3</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>
diff --git a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
index a416ea191..4e72cec1e 100644
--- a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
@@ -16,12 +16,12 @@
 
             <!-- MySQL implementation -->
             <fileSet>
-                <outputDirectory>/mysql/schema</outputDirectory>
+                <outputDirectory>mysql/schema</outputDirectory>
                 <directory>modules/guacamole-auth-jdbc-mysql/schema</directory>
             </fileSet>
             <fileSet>
-                <directory>modules/guacamole-auth-jdbc-mysql/target/extension</directory>
-                <outputDirectory>/mysql</outputDirectory>
+                <directory>modules/guacamole-auth-jdbc-mysql/target</directory>
+                <outputDirectory>mysql</outputDirectory>
                 <includes>
                     <include>*.jar</include>
                 </includes>
@@ -29,12 +29,12 @@
 
             <!-- PostgreSQL implementation -->
             <fileSet>
-                <outputDirectory>/postgresql/schema</outputDirectory>
+                <outputDirectory>postgresql/schema</outputDirectory>
                 <directory>modules/guacamole-auth-jdbc-postgresql/schema</directory>
             </fileSet>
             <fileSet>
-                <directory>modules/guacamole-auth-jdbc-postgresql/target/extension</directory>
-                <outputDirectory>/postgresql</outputDirectory>
+                <directory>modules/guacamole-auth-jdbc-postgresql/target</directory>
+                <outputDirectory>postgresql</outputDirectory>
                 <includes>
                     <include>*.jar</include>
                 </includes>
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index d217a9adb..8e67ab405 100644
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -35,7 +35,7 @@
             <!-- Assembly plugin - for easy distribution -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
+                <version>2.5.3</version>
                 <configuration>
                     <finalName>${project.artifactId}-${project.version}</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
diff --git a/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml b/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
index 0628ad61c..9b0b27dde 100644
--- a/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
@@ -16,13 +16,12 @@
 
             <!-- Include docs -->
             <fileSet>
-                <outputDirectory>/</outputDirectory>
                 <directory>doc</directory>
             </fileSet>
 
             <!-- Include schema -->
             <fileSet>
-                <outputDirectory>/schema</outputDirectory>
+                <outputDirectory>schema</outputDirectory>
                 <directory>schema</directory>
             </fileSet>
 
@@ -33,7 +32,7 @@
     <dependencySets>
         <dependencySet>
 
-            <outputDirectory>/lib</outputDirectory>
+            <outputDirectory>lib</outputDirectory>
             <scope>runtime</scope>
             <unpack>false</unpack>
             <useProjectArtifact>true</useProjectArtifact>
diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml
index a543ee2da..4596d32d6 100644
--- a/extensions/guacamole-auth-noauth/pom.xml
+++ b/extensions/guacamole-auth-noauth/pom.xml
@@ -35,7 +35,7 @@
             <!-- Assembly plugin - for easy distribution -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
+                <version>2.5.3</version>
                 <configuration>
                     <finalName>${project.artifactId}-${project.version}</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
diff --git a/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
index bb4280639..610749432 100644
--- a/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
@@ -14,11 +14,10 @@
     <!-- Include docs and schema -->
     <fileSets>
 
-            <!-- Include docs -->
-            <fileSet>
-                <outputDirectory>/</outputDirectory>
-                <directory>doc</directory>
-            </fileSet>
+        <!-- Include docs -->
+        <fileSet>
+            <directory>doc</directory>
+        </fileSet>
 
     </fileSets>
 
@@ -27,7 +26,7 @@
     <dependencySets>
         <dependencySet>
 
-            <outputDirectory>/lib</outputDirectory>
+            <outputDirectory>lib</outputDirectory>
             <scope>runtime</scope>
             <unpack>false</unpack>
             <useProjectArtifact>true</useProjectArtifact>
diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index 7dc88a2e6..4fcc1fca9 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -54,7 +54,7 @@
             <!-- Assemble JS files into single .zip -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.5.3</version>
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml
index c4de00582..552d82040 100644
--- a/guacamole-common/pom.xml
+++ b/guacamole-common/pom.xml
@@ -70,6 +70,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
+                <version>2.4</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -84,6 +85,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
                 <configuration>
                     <detectOfflineLinks>false</detectOfflineLinks>
                 </configuration>
diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml
index 298207f7a..4dc59dad0 100644
--- a/guacamole-ext/pom.xml
+++ b/guacamole-ext/pom.xml
@@ -70,6 +70,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
+                <version>2.4</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -84,6 +85,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
                 <configuration>
                     <detectOfflineLinks>false</detectOfflineLinks>
                 </configuration>
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 3d5847433..b221f59bf 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -69,6 +69,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
                 <configuration>
 
                     <!-- Filter translation strings -->
diff --git a/pom.xml b/pom.xml
index 8d0135870..1b34eef4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,12 +40,13 @@
             <!-- Assembly plugin - for easy distribution -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.5.3</version>
 
                 <!-- Build project archive -->
                 <configuration>
                     <finalName>${project.artifactId}-${project.version}</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
+                    <tarLongFileMode>gnu</tarLongFileMode>
                     <descriptors>
                         <descriptor>project-assembly.xml</descriptor>
                     </descriptors>
diff --git a/project-assembly.xml b/project-assembly.xml
index ec1d7249b..7745bb935 100644
--- a/project-assembly.xml
+++ b/project-assembly.xml
@@ -12,7 +12,6 @@
     <fileSets>
         <fileSet>
             <directory>${project.basedir}</directory>
-            <outputDirectory>/</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
             <excludes>
                 <exclude>**/*.log</exclude>