diff --git a/build/build.xml b/build/build.xml
index ec8889221..8b3634497 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -841,8 +841,8 @@
       <fileset dir="windows/launcher"
 	       includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini"/>
     </copy>
-    <launch4j configFile="windows/work/config.xml" />
-    <launch4j configFile="windows/work/config_debug.xml" />
+    <launch4j configFile="windows/work/config.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
+    <launch4j configFile="windows/work/config_debug.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
     <delete dir="windows/work" includes="application.ico, config.xml, config_debug.xml" />
     <copy file="windows/work/arduino.l4j.ini" tofile="windows/work/arduino_debug.l4j.ini" />
 
diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
index d14e7f13d..3f2982a79 100644
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -3,15 +3,8 @@
   <headerType>gui</headerType>
   <jar>lib</jar>
   <outfile>arduino.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>
+  <errTitle>Arduino</errTitle>
+  <downloadUrl>http://www.oracle.com/technetwork/java/javase/downloads/index.html</downloadUrl>
   <icon>application.ico</icon>
   <classPath>
     <mainClass>processing.app.Base</mainClass>
@@ -45,6 +38,14 @@
     <opt>-splash:./lib/splash.png</opt>
     <opt>-Dsun.java2d.d3d=false</opt>
   </jre>
+  <versionInfo>
+    <fileDescription>Arduino IDE</fileDescription>
+    <copyright>Arduino LLC</copyright>
+    <productName>Arduino</productName>
+    <companyName>Arduino LLC</companyName>
+    <internalName>arduino</internalName>
+    <originalFilename>arduino.exe</originalFilename>
+  </versionInfo>
   <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>
diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml
index 5c92f8309..bd4070332 100644
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@@ -3,15 +3,8 @@
   <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>
+  <errTitle>Arduino</errTitle>
+  <downloadUrl>http://www.oracle.com/technetwork/java/javase/downloads/index.html</downloadUrl>
   <icon>application.ico</icon>
   <classPath>
     <mainClass>processing.app.Base</mainClass>
@@ -44,6 +37,14 @@
     <runtimeBits>32</runtimeBits>
     <opt>-Dsun.java2d.d3d=false</opt>
   </jre>
+  <versionInfo>
+    <fileDescription>Arduino IDE</fileDescription>
+    <copyright>Arduino LLC</copyright>
+    <productName>Arduino</productName>
+    <companyName>Arduino LLC</companyName>
+    <internalName>arduino</internalName>
+    <originalFilename>arduino.exe</originalFilename>
+  </versionInfo>
   <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>