diff --git a/.gitignore b/.gitignore
index 3c2d6dd..4485fc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ local.properties
 proguard.cfg
 .settings
 tmp
-src/com/hoho
\ No newline at end of file
+src/com/hoho
+src/sources.txt
diff --git a/Makefile b/Makefile
index 13e381a..0a65237 100644
--- a/Makefile
+++ b/Makefile
@@ -2,21 +2,32 @@ all: build
 
 init:
 	cd usb-serial-for-android &&\
+	git submodule init &&\
+	git submodule update &&\
 	git pull origin master &&\
 	cd ../ &&\
 	cp -R usb-serial-for-android/UsbSerialLibrary/src/com src/
 
 compile:
 	cd src &&\
-	javac org/shokai/firmata/ArduinoFirmataException.java &&\
-	javac org/shokai/firmata/ArduinoFirmataEventHandler.java &&\
-	javac org/shokai/firmata/ArduinoFirmataDataHandler.java &&\
-	javac org/shokai/firmata/ArduinoFirmata.java
+	find -name "*.java" > sources.txt &&\
+	javac @sources.txt &&\
+	rm sources.txt
 
-build: compile
+buildfirmata: compile
 	cd src &&\
 	jar cvf arduino-firmata.jar ./org &&\
-	jar uvf arduino-firmata.jar ../README.md &&\
-	jar uvf arduino-firmata.jar ../LICENSE.txt &&\
-	jar uvf arduino-firmata.jar ../History.txt &&\
+	jar uvf arduino-firmata.jar -C .. README.md &&\
+	jar uvf arduino-firmata.jar -C .. LICENSE.txt &&\
+	jar uvf arduino-firmata.jar -C .. History.txt &&\
 	mv arduino-firmata.jar ../
+
+buildusbserial: compile
+	cd src &&\
+	jar cvf usb-serial-for-android.jar ./com &&\
+	jar uvf usb-serial-for-android.jar -C ../usb-serial-for-android README.md &&\
+	jar uvf usb-serial-for-android.jar -C ../usb-serial-for-android LICENSE.txt &&\
+	jar uvf usb-serial-for-android.jar -C ../usb-serial-for-android CHANGELOG.txt &&\
+	mv usb-serial-for-android.jar ../
+
+build: buildfirmata buildusbserial