diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
index e45b9b876e3682af2070227320241490e0a692f6..991004fdcb1e1701fa76a3daaacd8f193318f5d9 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
@@ -60,7 +60,6 @@ import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.BuildWrapper;
 import hudson.tasks.BuildWrappers;
 import hudson.tasks.Fingerprinter;
-import hudson.tasks.JavadocArchiver;
 import hudson.tasks.Mailer;
 import hudson.tasks.Maven;
 import hudson.tasks.Maven.MavenInstallation;
@@ -281,12 +280,22 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
         super(parent,name);
     }
 
-	public List<Builder> getPrebuilders() {
-        return prebuilders.toList();
+    /**
+     * Builders that are run before the main Maven execution.
+     *
+     * @since 1.433
+     */
+	public DescribableList<Builder,Descriptor<Builder>> getPrebuilders() {
+        return prebuilders;
     }
 	
-	public List<Builder> getPostbuilders() {
-        return postbuilders.toList();
+    /**
+     * Builders that are run after the main Maven execution.
+     *
+     * @since 1.433
+     */
+	public DescribableList<Builder,Descriptor<Builder>> getPostbuilders() {
+        return postbuilders;
     }
 	
 	/**
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
index afd9b81b51c17cc44b44122b9ac1054f5ec70761..d974633a1ee40d586638352350e783119a942d62 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -591,17 +591,6 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
                 } else {
                     // do builds here
                     try {
-                    	// run pre build steps
-                    	if(!preBuild(listener,project.getPrebuilders())){
-                    		r = FAILURE;
-                            return r;
-                    	}
-                    	if(!build(listener,project.getPrebuilders())){
-                    		r = FAILURE;
-                            return r;
-            			}
-                    	
-                    	
                         List<BuildWrapper> wrappers = new ArrayList<BuildWrapper>();
                         for (BuildWrapper w : project.getBuildWrappersList())
                             wrappers.add(w);
@@ -617,11 +606,20 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
                             e.buildEnvVars(envVars); // #3502: too late for getEnvironment to do this
                         }
 
+                    	// run pre build steps
+                    	if(!preBuild(listener,project.getPrebuilders())){
+                    		r = FAILURE;
+                            return r;
+                    	}
                         if(!preBuild(listener, project.getPublishers())){
                         	r = FAILURE;
                             return r;
                         }
 
+                    	if(!build(listener,project.getPrebuilders().toList())){
+                    		r = FAILURE;
+                            return r;
+            			}
 
                         String settingsConfigId = project.getSettingConfigId();
                         if (!StringUtils.isBlank(settingsConfigId)) {
@@ -805,7 +803,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
             					proceedPostSteps = false;
             				} 
             				if(proceedPostSteps){
-            			    	if(!build(listener,project.getPostbuilders())){
+            			    	if(!build(listener,project.getPostbuilders().toList())){
             			            r = FAILURE;
             					}
             				}