diff --git a/maven-mboot2/build b/maven-mboot2/build
index ec53a3f94c..07d4b3c078 100755
--- a/maven-mboot2/build
+++ b/maven-mboot2/build
@@ -1,13 +1,15 @@
 #!/bin/sh
 
 buildDir=target
+classesDir=${buildDir}/classes
+srcDir=src/main/java
 
 rm -rf ${buildDir} > /dev/null 2>&1
 
-mkdir ${buildDir}
+mkdir -p ${classesDir}
 
-javac -d ${buildDir} @sources.txt
+javac -d ${classesDir} ${srcDir}/*.java
 
-( cd ${buildDir} ; jar -cfm ../mboot.jar ../manifest.txt * )
+( cd ${classesDir} ; jar -cfm ../mboot.jar ../../manifest.txt * )
 
-cp mboot.jar ..
+cp ${buildDir}/mboot.jar ..
diff --git a/maven-mboot2/build.bat b/maven-mboot2/build.bat
index 2c0161256e..8e37161a68 100644
--- a/maven-mboot2/build.bat
+++ b/maven-mboot2/build.bat
@@ -1,15 +1,19 @@
 @echo off
 
 set buildDir=target
+set classesDir=%buildDir%\classes
+set srcDir=src\main\java
 
+if exist %classesDir% rmdir /S/Q %buildDir%
 if exist %buildDir% rmdir /S/Q %buildDir%
 
 mkdir %buildDir%
+mkdir %classesDir%
 
-%JAVA_HOME%\bin\javac -d %buildDir% @sources.txt
+%JAVA_HOME%\bin\javac -d %classesDir% %srcDir%\*.java
 
-cd %buildDir% 
-%JAVA_HOME%\bin\jar -cfm ..\mboot.jar ..\manifest.txt *
-cd ..
+cd %classesDir% 
+%JAVA_HOME%\bin\jar -cfm ..\mboot.jar ..\..\manifest.txt *.*
+cd ..\..
 
-copy mboot.jar ..
+copy %buildDir%\mboot.jar ..
diff --git a/maven-mboot2/sources.txt b/maven-mboot2/sources.txt
deleted file mode 100644
index e6d3acf359..0000000000
--- a/maven-mboot2/sources.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-src/main/java/ArtifactDownloader.java
-src/main/java/Base64.java
-src/main/java/FileUtils.java
-src/main/java/HttpUtils.java
-src/main/java/IsolatedClassLoader.java
-src/main/java/JavacCompiler.java
-src/main/java/AbstractCompiler.java
-src/main/java/CompilerError.java
-src/main/java/StreamPumper.java
-src/main/java/DirectoryScanner.java
-src/main/java/SelectorUtils.java
-src/main/java/MBoot.java
-src/main/java/SurefirePlugin.java
-src/main/java/JarMojo.java
-src/main/java/StringUtils.java
-src/main/java/IOUtil.java
-src/main/java/Commandline.java
-src/main/java/SurefireBooter.java
-src/main/java/Os.java