diff --git a/Makefile b/Makefile
index beb0fd8dbf..062587bdcb 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ clean:
 	#cd bindings/ruby; $(MAKE) clean; rm -rf Makefile
 	$(MAKE) -C bindings/python clean
 	$(MAKE) -C bindings/csharp clean
-	#$(MAKE) -C bindings/java clean
+	$(MAKE) -C bindings/java clean
 	$(MAKE) -C bindings/ocaml clean
 	$(MAKE) -C tests clean
 
diff --git a/bindings/java/Makefile b/bindings/java/Makefile
index e87d356092..494d7e8991 100644
--- a/bindings/java/Makefile
+++ b/bindings/java/Makefile
@@ -9,7 +9,6 @@ else
     JNA = /usr/share/java/jna.jar
   else
     JNA =
-    $(error Unable to find jna.jar)
   endif
 endif
 
@@ -20,11 +19,14 @@ all: capstone tests
 capstone: capstone_class
 	jar cf capstone.jar capstone/*.class
 
-capstone_class:
+capstone_class: jna
 	cd capstone; javac -classpath $(JNA) $(CAPSTONE_JAVA)
 
-tests:
+tests: jna
 	javac -classpath "$(JNA):capstone.jar" Test.java TestArm.java TestArm64.java TestMips.java TestX86.java
 
+jna:
+	@if [ ! $(JNA) ]; then echo "*** Unable to find JNA ***"; exit 1; fi
+
 clean:
 	rm -rf *.class *.log *.jar