diff --git a/Makefile.am b/Makefile.am
index 1ab01b51ed8dedfb2af0d25b7ab386bfc07823c3..f630f287e62854c6dee51bfd9e91c2b24716c29b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,9 +61,17 @@ ACLOCAL_AMFLAGS = -I m4
 if CPPUNIT
   UNIT_TESTS=unit_tests
 endif
-if X_JNI
-  JAVA_BINDINGS=bindings/java/
+
+if X_ANT
+  JAVA_BINDINGS=bindings/java
+else
+  JAVA_BINDINGS=bindings/java/jni
+endif
+
+if !X_JNI
+  JAVA_BINDINGS=
 endif
+
 SUBDIRS = tsk tools tests samples man $(UNIT_TESTS) $(JAVA_BINDINGS) 
 
 nobase_include_HEADERS = tsk/libtsk.h tsk/tsk_incs.h \
diff --git a/configure.ac b/configure.ac
index 83ac6b25a0ea283ec1af03e647eaef827c10a027..8d6ed482cc73463c0bea23eebaaf6aff818c81bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,6 +202,10 @@ if test "x$JAVAC" != x; then
 fi
 AM_CONDITIONAL([X_JNI],[test "x$JNI_CPPFLAGS" != x])
 
+# Test is ant is available
+AC_PATH_PROG([ANT_FOUND], [ant], [])
+AM_CONDITIONAL([X_ANT],[test "x$ANT_FOUND" != x])
+
 AC_CONFIG_COMMANDS([tsk/tsk_incs.h],
         [
           echo "#ifndef _TSK_INCS_H" > tsk/tsk_incs.h