diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh
index 03e4a0414026..8d06352b1356 100644
--- a/pkgs/development/tools/build-managers/apache-maven/builder.sh
+++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh
@@ -2,16 +2,16 @@ source $stdenv/setup
 
 unpackPhase
 
-mkdir -p $out
-cp -r $name/* $out
+mkdir -p $out/maven
+cp -r $name/* $out/maven
 
-wrapProgram $out/bin/mvn --set JAVA_HOME "$jdk"
+makeWrapper $out/maven/bin/mvn $out/bin/mvn --set JAVA_HOME "$jdk"
 
 # Add the maven-axis and JIRA plugin by default when using maven 1.x
-if [ -e $out/bin/maven ]
+if [ -e $out/maven/bin/maven ]
 then
   export OLD_HOME=$HOME
   export HOME=.
-  $out/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7
+  $out/maven/bin/maven plugin:download -DgroupId=maven-plugins -DartifactId=maven-axis-plugin -Dversion=0.7
   export HOME=OLD_HOME
 fi