diff --git a/SWIG/Source/Include/swigver.h b/SWIG/Source/Include/swigver.h
index 51d16c0ca..a3a3c3e5e 100644
--- a/SWIG/Source/Include/swigver.h
+++ b/SWIG/Source/Include/swigver.h
@@ -1,5 +1,5 @@
 
 /* SWIG version information */
 
-#define SWIG_VERSION "1.3u-20000305-1721"
+#define SWIG_VERSION "1.3u-20000306-0939"
 #define SWIG_SPIN "(Alpha 2)"
diff --git a/SWIG/configure.in b/SWIG/configure.in
index 13b8dcc6d..a5a4b9606 100644
--- a/SWIG/configure.in
+++ b/SWIG/configure.in
@@ -490,7 +490,7 @@ AC_MSG_CHECKING(for java include file jni.h)
 AC_ARG_WITH(javaincl, [  --with-javaincl=path    Set location of Java include directory], [JAVAINCDIR="$withval"], [JAVAINCDIR=nope])
 
 if test "$JAVAINCDIR" = nope; then
-  JAVAINCDIR="/usr/java/include /usr/local/java/include /opt/java/include /usr/include/java /usr/local/include/java /usr/include/kaffe /usr/local/include/kaffe /usr/include /usr/local/include"
+  JAVAINCDIR="/usr/jdk*/include /usr/local/jdk*/include /opt/jdk*/include /usr/java/include /usr/local/java/include /opt/java/include /usr/include/java /usr/local/include/java /usr/include/kaffe /usr/local/include/kaffe /usr/include /usr/local/include"
 fi
 
 JAVAINC=""
@@ -506,9 +506,9 @@ done
 if test "$JAVAINC" = "" ; then
   AC_MSG_RESULT(not found)
 else
-  # now look for <arch>/md.h
-  AC_MSG_CHECKING(for java include file md.h)
-  JAVAMDDIR=`find $JAVAINCDIR -name md.h -print`
+  # now look for <arch>/jni_md.h
+  AC_MSG_CHECKING(for java include file jni_md.h)
+  JAVAMDDIR=`find $JAVAINCDIR -name jni_md.h -print`
   if test "$JAVAMDDIR" = "" ; then
     AC_MSG_RESULT(not found)
   else