diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 4fd1e295ef6..ed90f084cfb 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/llvm-java]) ;;
+      "llvm-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 44171c459e4..d0bb9741924 100755
--- a/configure
+++ b/configure
@@ -1591,7 +1591,7 @@ subdirs="$subdirs projects/llvm-reopt"
 
 subdirs="$subdirs projects/llvm-gcc"
   ;;
-      "Java")
+      "llvm-java")
 
 subdirs="$subdirs projects/llvm-java"
  ;;