Index: maven-core/src/bin/mvn.bat
===================================================================
--- maven-core/src/bin/mvn.bat	(revision 545143)
+++ maven-core/src/bin/mvn.bat	(working copy)
@@ -130,12 +130,12 @@
 if "%@eval[2+2]" == "4" goto 4NTCWJars
 
 @REM -- Regular WinNT shell
-for %%i in ("%M2_HOME%"\core\boot\classworlds-*) do set CLASSWORLDS_JAR="%%i"
+for %%i in ("%M2_HOME%"\boot\classworlds-*) do set CLASSWORLDS_JAR="%%i"
 goto runm2
 
 @REM The 4NT Shell from jp software
 :4NTCWJars
-for %%i in ("%M2_HOME%\core\boot\classworlds-*") do set CLASSWORLDS_JAR="%%i"
+for %%i in ("%M2_HOME%\boot\classworlds-*") do set CLASSWORLDS_JAR="%%i"
 goto runm2
 
 @REM Start MAVEN2