diff --git a/build/build.xml b/build/build.xml
index c6c0d39bf..6658b21dd 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -696,11 +696,12 @@
 
     <copy todir="windows/work">
       <fileset dir="windows/launcher"
-	       includes="about.bmp, application.ico, config.xml"/>
+	       includes="about.bmp, application.ico, config.xml, config_debug.xml"/>
     </copy>
     <launch4j configFile="windows/work/config.xml" />
+    <launch4j configFile="windows/work/config_debug.xml" />
     <delete dir="windows/work"
-	    includes="about.bmp, application.ico, config.xml" />
+	    includes="about.bmp, application.ico, config.xml, config_debug.xml" />
 
     <!-- cygwin requires html, dll, and exe to have the +x flag -->
     <chmod perm="755">
diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml
new file mode 100644
index 000000000..dad78eb9e
--- /dev/null
+++ b/build/windows/launcher/config_debug.xml
@@ -0,0 +1,44 @@
+<launch4jConfig>
+  <dontWrapJar>true</dontWrapJar>
+  <headerType>console</headerType>
+  <jar>lib</jar>
+  <outfile>arduino_debug.exe</outfile>
+  <errTitle></errTitle>
+  <cmdLine></cmdLine>
+  <chdir>.</chdir>
+  <priority>normal</priority>
+  <downloadUrl>http://java.sun.com/javase/downloads/</downloadUrl>
+  <supportUrl></supportUrl>
+  <customProcName>false</customProcName>
+  <stayAlive>false</stayAlive>
+  <manifest></manifest>
+  <icon>application.ico</icon>
+  <classPath>
+    <mainClass>processing.app.Base</mainClass>
+    <cp>lib/pde.jar</cp>
+    <cp>lib/core.jar</cp>
+    <cp>lib/jna.jar</cp>
+    <cp>lib/ecj.jar</cp>
+    <cp>lib/jssc-2.6.0.jar</cp>
+    <cp>lib/commons-codec-1.7.jar</cp>
+    <cp>lib/commons-exec-1.1.jar</cp>
+    <cp>lib/commons-httpclient-3.1.jar</cp>
+    <cp>lib/commons-logging-1.0.4.jar</cp>
+    <cp>lib/jmdns-3.4.1.jar</cp>
+    <cp>lib/jsch-0.1.50.jar</cp>
+  </classPath>
+  <jre>
+    <path>java</path>
+    <minVersion>1.6.0</minVersion>
+    <maxVersion></maxVersion>
+    <jdkPreference>preferJre</jdkPreference>
+    <opt>-Xms128m -Xmx128m</opt>
+  </jre>
+  <messages>
+    <startupErr>An error occurred while starting the application.</startupErr>
+    <bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
+    <jreVersionErr>This application requires at least Java Development Kit</jreVersionErr>
+    <launcherErr>The registry refers to a nonexistent Java Development Kit  installation or the runtime is corrupted.</launcherErr>
+    <instanceAlreadyExistsMsg>An application instance is already running.</instanceAlreadyExistsMsg>
+  </messages>
+</launch4jConfig>