diff --git a/project/pom.xml b/project/pom.xml
index 8d0208ff63..4d2aa62cbe 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -400,6 +400,7 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <additionalJOption>-J-Xmx128m</additionalJOption>
                     <encoding>${sourceEncoding}</encoding>                        
                     <quiet>true</quiet>
                     <links>
@@ -604,9 +605,7 @@ pageTracker._trackPageview();
                 <plugins>
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <!-- Can't use variables in outputDirectory in earlier versions.
-                          See http://jira.codehaus.org/browse/MASSEMBLY-142. -->
-                        <version>2.2-SNAPSHOT</version>
+                        <version>2.2-beta-5</version>
                         <executions>
                             <execution>
                                 <id>generate-distribution-files</id>