diff --git a/build-spring-integration/resources/samples/cafeDemo.bat b/build-spring-integration/resources/samples/cafeDemo.bat
index 26a3eee3c3..5fd937d3c2 100644
--- a/build-spring-integration/resources/samples/cafeDemo.bat
+++ b/build-spring-integration/resources/samples/cafeDemo.bat
@@ -1 +1,8 @@
-@java -classpath ..\dist\spring-integration-core-1.0.0.m1.jar;..\dist\spring-integration-samples-1.0.0.m1.jar;..\lib\aopalliance-1.0.jar;..\lib\commons-logging-1.1.jar;..\lib\spring-aop-2.5.0.jar;..\lib\spring-beans-2.5.0.jar;..\lib\spring-context-2.5.0.jar;..\lib\spring-context-support-2.5.0.jar;..\lib\spring-core-2.5.0.jar org.springframework.integration.samples.cafe.CafeDemo %1 %2 %3 %4 %5 %6 %7 %8 %9
+@echo off
+
+setlocal ENABLEDELAYEDEXPANSION
+
+for /r ..\dist %%j IN (*.jar) do set CP=!CP!;%%j
+for /r ..\lib %%j IN (*.jar) do set CP=!CP!;%%j
+
+@java -cp %CP% org.springframework.integration.samples.cafe.CafeDemo %1
\ No newline at end of file