diff --git a/bin/buildhdf5 b/bin/buildhdf5
index 4c848841b00..a2a13cb225c 100755
--- a/bin/buildhdf5
+++ b/bin/buildhdf5
@@ -25,7 +25,7 @@ can continue from a previous build.
 
 Command Syntax
 ==============
-buildhdf5 [-config] [-szlib] [-help] [-n] [-srcdir dir] [-fortran] [-cxx] [-pp] config-arguments ...
+buildhdf5 [-config] [-szlib] [-help] [-n] [-srcdir dir] [-fortran] [-cxx] [-java] [-pp] config-arguments ...
    -config:	run configure only. [default to do build too]
    -szlib:      configure in the szlib option
    -help:	show this help page
@@ -35,6 +35,7 @@ buildhdf5 [-config] [-szlib] [-help] [-n] [-srcdir dir] [-fortran] [-cxx] [-pp]
              	    which will be passed to configure]
    -fortran:	add --enable-fortran
    -cxx:	add --enable-cxx
+   -java:       add --enable-java
    -pp:		add --enable-parallel
    all other arguments are passed to configure
 
@@ -251,6 +252,9 @@ while [ $# -gt 0 ]; do
 	-cxx)
 	    CONFIG_OP="$CONFIG_OP --enable-cxx"
 	    ;;
+        -java)
+            CONFIG_OP="$CONFIG_OP --enable-java"
+            ;;
 	-fortran)
 	    CONFIG_OP="$CONFIG_OP --enable-fortran"
 	    ;;
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5
index e59c772a3b3..f17b9c4d131 100755
--- a/bin/cmakehdf5
+++ b/bin/cmakehdf5
@@ -45,6 +45,7 @@ fi
 cacheinit=$srcdir/config/cmake/cacheinit.cmake
 build_cpp_lib=-DHDF5_BUILD_CPP_LIB:BOOL=OFF	# C++ interface default off
 build_fortran=-DHDF5_BUILD_FORTRAN:BOOL=OFF	# Fortran interface default off
+build_java=-DHDF5_BUILD_JAVA:BOOL=OFF           # Java interface default off
 build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON	# High Level interface default on
 build_threadsafe=-DHDF5_ENABLE_THREADSAFE:BOOL=OFF  # Threadsafe feature default off
 build_testing=-DBUILD_TESTING:BOOL=ON		# Build tests default on
@@ -82,6 +83,8 @@ Usage: $progname [<options>]
     enable or disable fortran API. Default is off.
   --enable-cxx | --disable-cxx:
     enable or disable c++ API. Default is off.
+  --enable-java | --disable-java:
+    enable or disable Java API. Default is off.
   --enable-hl | --disable-hl:
     enable or disable high level API. Default is on.
   --enable-threadsafe | --disable-threadsafe:
@@ -210,6 +213,7 @@ fi
 # XXX can be:
 # fortran	Fortran interface
 # cxx		C++ interface
+# java          Java interface
 # hl		Highlevel interface
 # testing	Build tests
 # tools		Build tools
@@ -227,6 +231,12 @@ while [ $# -gt 0 ]; do
 	--disable-cxx)
 	    build_cpp_lib=-DHDF5_BUILD_CPP_LIB:BOOL=OFF
 	    ;;
+        --enable-java)
+            build_java=-DHDF5_BUILD_JAVA:BOOL=ON
+	    ;;
+        --disable-java)
+            build_java=-DHDF5_BUILD_JAVA:BOOL=OFF
+	    ;;
 	--enable-hl)
 	    build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON
 	    ;;
@@ -345,6 +355,7 @@ STEP "Configure..." \
     -C $cacheinit \
     $build_cpp_lib \
     $build_fortran \
+    $build_java \
     $build_hl_lib \
     $build_threadsafe \
     $shared_lib \
diff --git a/test/dt_arith.c b/test/dt_arith.c
index c006c49a911..a26945f58e2 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -2817,7 +2817,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
     int   status;    /*child exit status    */
 
     /*
-     * Some systems generage SIGFPE during floating point overflow and we
+     * Some systems generate SIGFPE during floating point overflow and we
      * cannot assume that we can continue from such a signal.  Therefore, we
      * fork here and let the child run the test and return the number of
      * failures with the exit status.
diff --git a/test/onion.c b/test/onion.c
index d0eaa870bc6..03730a7a425 100644
--- a/test/onion.c
+++ b/test/onion.c
@@ -1035,7 +1035,7 @@ test_history_encode_decode_empty(void)
 
     TESTING("encode/decode history (empty and failures)");
 
-    /* Generage checksum but don't store it yet */
+    /* Generate checksum but don't store it yet */
     checksum = H5_checksum_fletcher32(exp, H5FD_ONION_ENCODED_SIZE_HISTORY - 4);
     ptr      = exp + H5FD_ONION_ENCODED_SIZE_HISTORY - 4;
     UINT32ENCODE(ptr, checksum);
diff --git a/test/test_error.sh.in b/test/test_error.sh.in
index 72bb943eb58..1e6a5603a6d 100644
--- a/test/test_error.sh.in
+++ b/test/test_error.sh.in
@@ -14,7 +14,7 @@
 
 srcdir=@srcdir@
 
-# Determine backward compatibility options eneabled
+# Check if backward compatibility options are enabled
 DEPRECATED_SYMBOLS="@DEPRECATED_SYMBOLS@"
 
 CMP='cmp -s'