diff --git a/graphviz.spec b/graphviz.spec
index 8983e79..467b4b9 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -141,6 +141,7 @@ BuildRequires:		libSM-devel
 BuildRequires:		libXext-devel
 %if %{JAVA}
 BuildRequires:		java-devel
+BuildRequires:		javapackages-tools
 %endif
 BuildRequires:		cairo-devel >= 1.1.10
 BuildRequires:		pango-devel
@@ -421,8 +422,7 @@ autoreconf -fi
 
 %if %{JAVA}
 # Hack in the java includes we need
-sed -i '/JavaVM.framework/!s/JAVA_INCLUDES=/JAVA_INCLUDES=\"_MY_JAVA_INCLUDES_\"/g' configure
-sed -i 's|_MY_JAVA_INCLUDES_|-I%{java_home}/include/ -I%{java_home}/include/linux/|g' configure
+sed -i 's|for try_java_include in|& %{java_home}/include/ %{java_home}/include/linux/|' configure
 %endif
 # Rewrite config_ruby.rb to work with Ruby 2.2
 sed -i 's|expand(|expand(RbConfig::|' config/config_ruby.rb