diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 2ed25da8707..0eae14fb7c1 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -72,7 +72,7 @@ do
       "llvm-test")    AC_CONFIG_SUBDIRS([projects/llvm-test]) ;;
       "llvm-reopt")   AC_CONFIG_SUBDIRS([projects/llvm-reopt]);;
       "llvm-gcc")     AC_CONFIG_SUBDIRS([projects/llvm-gcc])  ;;
-      "Java")         AC_CONFIG_SUBDIRS([projects/Java])      ;;
+      "Java")         AC_CONFIG_SUBDIRS([projects/llvm-java]) ;;
       "llvm-tv")      AC_CONFIG_SUBDIRS([projects/llvm-tv])   ;;
       "llvm-fefw")    AC_CONFIG_SUBDIRS([projects/llvm-fefw]) ;;
       "poolalloc")    AC_CONFIG_SUBDIRS([projects/poolalloc]) ;;
diff --git a/configure b/configure
index df7bc19a200..6146e151ff9 100755
--- a/configure
+++ b/configure
@@ -435,7 +435,7 @@ ac_subdirs_all="$ac_subdirs_all projects/Stacker"
 ac_subdirs_all="$ac_subdirs_all projects/llvm-test"
 ac_subdirs_all="$ac_subdirs_all projects/llvm-reopt"
 ac_subdirs_all="$ac_subdirs_all projects/llvm-gcc"
-ac_subdirs_all="$ac_subdirs_all projects/Java"
+ac_subdirs_all="$ac_subdirs_all projects/llvm-java"
 ac_subdirs_all="$ac_subdirs_all projects/llvm-tv"
 ac_subdirs_all="$ac_subdirs_all projects/llvm-fefw"
 ac_subdirs_all="$ac_subdirs_all projects/poolalloc"