diff --git a/compile_win.sh b/compile_win.sh
index 66fbe92..197eb8c 100755
--- a/compile_win.sh
+++ b/compile_win.sh
@@ -1,15 +1,19 @@
 #!/bin/bash -xe
 
-JAVA_INCLUDE_PATH=/opt/jvm/jdk1.8.0/include/
+JAVA_INCLUDE_PATH=/usr/lib/jvm/java-8-openjdk-amd64/include/
+ARCH=i686-w64-mingw32
+CC=$ARCH-gcc
+STRIP=$ARCH-strip
 
-mkdir -p distrib/windows
+mkdir -p distrib/$ARCH
 cd libserialport
 ./autogen.sh
-./configure --host=i686-w64-mingw32
+./configure --host=$ARCH
 make clean
 make
 cd ..
-i686-w64-mingw32-gcc main.c -Llibserialport/.libs/ -Ilibserialport/ -lserialport -lsetupapi -static -o listSerialC.exe
-cp listSerialC.exe distrib/windows/
-i686-w64-mingw32-gcc -D_JNI_IMPLEMENTATION_ -Wl,--kill-at jnilib.c libserialport/.libs/libserialport.a -lsetupapi -Ilibserialport/ -I/opt/jvm/jdk1.8.0/include/ -Iwin32_jni -shared -o listSerialsj.dll
-cp listSerialsj.dll distrib/windows/
\ No newline at end of file
+$CC main.c -Llibserialport/.libs/ -Ilibserialport/ -lserialport -lsetupapi -static -o listSerialC.exe
+cp listSerialC.exe distrib/$ARCH/
+$CC -D_JNI_IMPLEMENTATION_ -Wl,--kill-at jnilib.c libserialport/.libs/libserialport.a -lsetupapi -Ilibserialport/ -I$JAVA_INCLUDE_PATH -Iwin32_jni -shared -o listSerialsj.dll
+$STRIP listSerialsj.dll
+cp listSerialsj.dll distrib/$ARCH/
diff --git a/compile_win64.sh b/compile_win64.sh
new file mode 100755
index 0000000..44ed2fd
--- /dev/null
+++ b/compile_win64.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -xe
+
+JAVA_INCLUDE_PATH=/usr/lib/jvm/java-8-openjdk-amd64/include/
+ARCH=x86_64-w64-mingw32
+CC=$ARCH-gcc
+STRIP=$ARCH-strip
+
+mkdir -p distrib/$ARCH/
+cd libserialport
+./autogen.sh
+./configure --host=$ARCH
+make clean
+make
+cd ..
+$CC main.c -Llibserialport/.libs/ -Ilibserialport/ -lserialport -lsetupapi -static -o listSerialC.exe
+cp listSerialC.exe distrib/$ARCH/
+$CC -D_JNI_IMPLEMENTATION_ -Wl,--kill-at jnilib.c libserialport/.libs/libserialport.a -lsetupapi -Ilibserialport/ -I$JAVA_INCLUDE_PATH -Iwin32_jni -shared -o listSerialsj.dll
+$STRIP listSerialsj.dll
+cp listSerialsj.dll distrib/$ARCH/