diff --git a/ant-antlr.spec b/ant-antlr.spec
index a87b28f..f50baf8 100644
--- a/ant-antlr.spec
+++ b/ant-antlr.spec
@@ -51,9 +51,7 @@ Patch1:         apache-ant-class-path-in-manifest.patch
 
 %if %bootstrap
 BuildRequires:  gpg-offline
-BuildRequires:  java-1_5_0-gcj-compat-devel
-#!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel
-#!BuildIgnore:  java-1_7_0-openjdk java-1_7_0-openjdk-devel
+BuildRequires:  java-devel
 %else
 BuildRequires:  java-devel >= 1.5.0
 %endif
@@ -506,7 +504,7 @@ export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bce
 export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
 export JAVA_HOME=%{java_home}
 export CLASSPATH=$JAVA_HOME/lib/tools.jar
-export BOOTJAVAC_OPTS="-C -Wno-deprecated"
+export BOOTJAVAC_OPTS=""
 sh -x ./build.sh --noconfig jars
 
 %endif
diff --git a/ant.changes b/ant.changes
index 6a7de0a..86266d1 100644
--- a/ant.changes
+++ b/ant.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 23 12:55:35 UTC 2014 - darin@darins.net
+
+- Update packaging to build the openjdk and not gcj 
+
 -------------------------------------------------------------------
 Thu Jan  2 08:36:18 UTC 2014 - mvyskocil@suse.com
 
diff --git a/ant.spec b/ant.spec
index 32d4d92..0d9aece 100644
--- a/ant.spec
+++ b/ant.spec
@@ -50,9 +50,7 @@ Patch1:         apache-ant-class-path-in-manifest.patch
 
 %if %bootstrap
 BuildRequires:  gpg-offline
-BuildRequires:  java-1_5_0-gcj-compat-devel
-#!BuildIgnore:  java-1_6_0-openjdk java-1_6_0-openjdk-devel
-#!BuildIgnore:  java-1_7_0-openjdk java-1_7_0-openjdk-devel
+BuildRequires:  java-devel
 %else
 BuildRequires:  java-devel >= 1.5.0
 %endif
@@ -505,7 +503,7 @@ export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bce
 export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
 export JAVA_HOME=%{java_home}
 export CLASSPATH=$JAVA_HOME/lib/tools.jar
-export BOOTJAVAC_OPTS="-C -Wno-deprecated"
+export BOOTJAVAC_OPTS=""
 sh -x ./build.sh --noconfig jars
 
 %endif