diff --git a/build/config/ax_check_java.m4 b/build/config/ax_check_java.m4
index 1aa3c7d0d0..d83895e721 100644
--- a/build/config/ax_check_java.m4
+++ b/build/config/ax_check_java.m4
@@ -22,7 +22,7 @@ then
   AC_MSG_RESULT()
 
 dnl these two lines should let u find most java installations
-  java_dirs="/usr /usr/local /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java /System/Library/Frameworks/JavaVM.framework/Versions/Current /opt /mingw"
+  java_dirs="/usr /usr/local /usr/lib/j2sdk1.4-sun /usr/lib/jvm/java /usr/lib/jvm/default-java /System/Library/Frameworks/JavaVM.framework/Versions/Current /opt /mingw"
   java_inc_dirs="include include/libgcj Headers"
   
   if test "x$with_java" != 'x'
diff --git a/src/mod/languages/mod_java/Makefile.am b/src/mod/languages/mod_java/Makefile.am
index 5d90be0855..2e43bd5f4a 100644
--- a/src/mod/languages/mod_java/Makefile.am
+++ b/src/mod/languages/mod_java/Makefile.am
@@ -4,9 +4,7 @@ MODNAME=mod_java
 mod_LTLIBRARIES = mod_java.la
 mod_java_la_SOURCES  = mod_java.cpp freeswitch_java.cpp switch_swig_wrap.cpp modjava.c
 mod_java_la_CFLAGS   = $(AM_CFLAGS)
-mod_java_la_CPPFLAGS = -I/usr/lib/jvm/java-gcj/include
-mod_java_la_CPPFLAGS+= -I/usr/lib/jvm/java-gcj/include/linux
-mod_java_la_CPPFLAGS+= $(AM_CPPFLAGS)
+mod_java_la_CPPFLAGS = $(JAVA_FLAGS) $(AM_CPPFLAGS)
 mod_java_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_java_la_LDFLAGS  = -avoid-version -module -no-undefined -shared