diff --git a/Makefile.am b/Makefile.am
index f630f287e62854c6dee51bfd9e91c2b24716c29b..33390d34bbf3ed82f0ef5f3d0cd8ef71943d311b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,13 +62,9 @@ if CPPUNIT
   UNIT_TESTS=unit_tests
 endif
 
-if X_ANT
-  JAVA_BINDINGS=bindings/java
-else
-  JAVA_BINDINGS=bindings/java/jni
-endif
-
-if !X_JNI
+if X_JNI
+  JAVA_BINDINGS=bindings/java/jni bindings/java
+else   
   JAVA_BINDINGS=
 endif
 
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 7b7d58f978cfc80ff8625f4d99bea5f8d7e2cb6f..fa70d5ca8236a1b6e1c426022d1b5c7dbfd5db9d 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = jni
-
 Z_PATH=@Z_PATH@
 EWF_PATH=@EWF_PATH@
 ANT_PROPS=
@@ -13,7 +11,7 @@ if X_LIBEWF
 endif
 
 tsk_jar = $(top_builddir)/bindings/java/dist/Tsk_DataModel.jar
-jardir = /usr/share/java
+jardir = $(prefix)/share/java
 jar_DATA = $(tsk_jar)
 
 
diff --git a/configure.ac b/configure.ac
index 2c34b7a632f7470d0d501a78f07603bfaf99855a..20ae55f7912061194c5511ce27f3a38e61d6e53a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,11 +218,10 @@ AS_IF([test "x$enable_java" != "xno"], [
         AC_SUBST(JNI_CPPFLAGS, $JNI_CPPFLAGS)
     fi
 ]) # test enable_java
-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])
+AM_CONDITIONAL([X_JNI],[test "x$JNI_CPPFLAGS" != x && test "x$ANT_FOUND" != x])
 
 AC_CONFIG_COMMANDS([tsk/tsk_incs.h],
         [