diff --git a/java/build.xml b/java/build.xml
index 9d86d58..c139385 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project default="jar" name="Build file for Project Mimis">
-    <target name="javadoc">
-        <javadoc access="private" author="true" classpath="cfg;resource;lib/log4j-1.2.16.jar;lib/jxinput.jar;lib/commons-logging-1.1.1.jar;lib/jacob-1.15-M3.jar" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="mimis.exception.macro,mimis.device.network,wiiusej,mimis.application.itunes,mimis.exception.util,mimis.device.javainput,wiiusej.wiiusejevents,wiiusej.wiiusejevents.utils,mimis.util.swing,mimis.exception.worker,mimis.application.lirc,mimis.application.cmd.windows.winamp,wiiusej.values,mimis.exception.event,mimis.device.lirc.remote,mimis.device.panel,mimis.exception.device,mimis.exception.button,mimis.application.robot,mimis.application.lirc.ipod,mimis.exception.task.action,mimis.exception.application,wiiusej.wiiusejevents.wiiuseapievents,mimis.application.cmd.windows.gomplayer,mimis.application.mpc,org.wiigee.logic,mimis.device.lirc,mimis.sequence,mimis.manager,org.wiigee.util,mimis.event,mimis.application.cmd.windows.wmp,mimis.value,mimis.device.javainput.extreme3d,mimis.event.router,mimis.application.cmd,mimis.worker,org.wiigee.event,mimis.device.wiimote,mimis.device.wiimote.gesture.event,wiiusej.wiiusejevents.physicalevents,mimis.util.multiplexer,mimis,org.wiigee.control,mimis.exception.device.javainput,mimis.util,mimis.application.cmd.windows,com.dt.iTunesController,org.wiigee.device,mimis.application.vlc,mimis.device.wiimote.gesture,mimis.device.jintellitype,mimis.event.feedback,mimis.device,org.wiigee.filter,mimis.exception.application.windows,mimis.application,mimis.sequence.state,mimis.device.javainput.rumblepad,com.melloware.jintellitype,mimis.exception.event.router,mimis.exception.task,mimis.exception" source="1.6" sourcepath="src" splitindex="true" use="true" version="true"/>
-    </target>
-	<property name="dir" value="."/>
+	<!-- Javadoc -->
+	<target name="javadoc">
+		<javadoc access="private" author="true" classpath="cfg;resource;lib/log4j-1.2.16.jar;lib/jxinput.jar;lib/commons-logging-1.1.1.jar;lib/jacob-1.15-M3.jar" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="mimis.exception.macro,mimis.device.network,wiiusej,mimis.application.itunes,mimis.exception.util,mimis.device.javainput,wiiusej.wiiusejevents,wiiusej.wiiusejevents.utils,mimis.util.swing,mimis.exception.worker,mimis.application.lirc,mimis.application.cmd.windows.winamp,wiiusej.values,mimis.exception.event,mimis.device.lirc.remote,mimis.device.panel,mimis.exception.device,mimis.exception.button,mimis.application.robot,mimis.application.lirc.ipod,mimis.exception.task.action,mimis.exception.application,wiiusej.wiiusejevents.wiiuseapievents,mimis.application.cmd.windows.gomplayer,mimis.application.mpc,org.wiigee.logic,mimis.device.lirc,mimis.sequence,mimis.manager,org.wiigee.util,mimis.event,mimis.application.cmd.windows.wmp,mimis.value,mimis.device.javainput.extreme3d,mimis.event.router,mimis.application.cmd,mimis.worker,org.wiigee.event,mimis.device.wiimote,mimis.device.wiimote.gesture.event,wiiusej.wiiusejevents.physicalevents,mimis.util.multiplexer,mimis,org.wiigee.control,mimis.exception.device.javainput,mimis.util,mimis.application.cmd.windows,com.dt.iTunesController,org.wiigee.device,mimis.application.vlc,mimis.device.wiimote.gesture,mimis.device.jintellitype,mimis.event.feedback,mimis.device,org.wiigee.filter,mimis.exception.application.windows,mimis.application,mimis.sequence.state,mimis.device.javainput.rumblepad,com.melloware.jintellitype,mimis.exception.event.router,mimis.exception.task,mimis.exception" source="1.6" sourcepath="src" splitindex="true" use="true" version="true"/>
+	</target>
+
+	<!-- Jar -->
+	<property name="jar.dir" value="."/>
 	<target name="jar">
-		<jar destfile="${dir}/main.jar" filesetmanifest="mergewithoutmain">
+		<jar destfile="${jar.dir}/main.jar" filesetmanifest="mergewithoutmain">
 			<manifest>
 				<attribute name="Main-Class" value="mimis.Main" />
 				<attribute name="Class-Path" value="." />
@@ -18,7 +21,7 @@
 			<zipfileset excludes="META-INF/*.SF" src="lib/jxinput.jar" />
 			<fileset dir="cfg" />
 		</jar>
-		<jar destfile="${dir}/client.jar" filesetmanifest="mergewithoutmain">
+		<jar destfile="${jar.dir}/client.jar" filesetmanifest="mergewithoutmain">
 			<manifest>
 				<attribute name="Main-Class" value="mimis.Client" />
 				<attribute name="Class-Path" value="." />
@@ -31,11 +34,25 @@
 			<zipfileset excludes="META-INF/*.SF" src="lib/jxinput.jar" />
 			<fileset dir="cfg" />
 		</jar>
-		<!--copy todir="${dir}">
+		<copy todir="${jar.dir}">
 			<fileset dir=".">
 				<include name="*.dll" />
 				<include name="*.exe" />
 			</fileset>
-		</copy-->
+		</copy>
+	</target>
+
+	<!-- Launch4j -->
+	<property name="launch4j.dir" location="C:\Program Files (x86)\Launch4j" />
+	<path id="launch4j">
+		<pathelement location="${launch4j.dir}/launch4j.jar"/>
+		<pathelement location="${launch4j.dir}/lib/xstream.jar"/>
+	</path>
+	<taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask">
+		<classpath refid="launch4j" />
+	</taskdef>
+	<target name="launch4j">
+		<launch4j configFile="launch4j.xml" />
+		<delete file="launch4j.log" />
 	</target>
 </project>
diff --git a/java/launch4j.xml b/java/launch4j.xml
new file mode 100644
index 0000000..d3043f1
--- /dev/null
+++ b/java/launch4j.xml
@@ -0,0 +1,22 @@
+<launch4jConfig>
+  <dontWrapJar>false</dontWrapJar>
+  <headerType>gui</headerType>
+  <jar>main.jar</jar>
+  <outfile>mimis.exe</outfile>
+  <errTitle>Mimis</errTitle>
+  <cmdLine></cmdLine>
+  <chdir></chdir>
+  <priority>normal</priority>
+  <downloadUrl>http://java.com/download</downloadUrl>
+  <supportUrl></supportUrl>
+  <customProcName>true</customProcName>
+  <stayAlive>false</stayAlive>
+  <manifest></manifest>
+  <icon>resource\M.ico</icon>
+  <jre>
+    <path></path>
+    <minVersion>1.6.0</minVersion>
+    <maxVersion></maxVersion>
+    <jdkPreference>preferJre</jdkPreference>
+  </jre>
+</launch4jConfig>
\ No newline at end of file
diff --git a/java/mimis.exe b/java/mimis.exe
new file mode 100644
index 0000000..3933eaf
Binary files /dev/null and b/java/mimis.exe differ
diff --git a/java/resource/M.ico b/java/resource/M.ico
new file mode 100644
index 0000000..d6d7103
Binary files /dev/null and b/java/resource/M.ico differ
diff --git a/java/resource/Mimis.bmp b/java/resource/Mimis.bmp
new file mode 100644
index 0000000..c5ac533
Binary files /dev/null and b/java/resource/Mimis.bmp differ