diff --git a/CHANGES.txt b/CHANGES.txt
index 3de134b8055..ab3f3181d4f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -658,6 +658,8 @@ Other Changes
 24. Upgraded to Lucene 2.4-dev (r686801) (yonik)
 25. Upgraded to Lucene 2.4-dev (r688745) 27-Aug-2008 (yonik)
 26. Upgraded to Lucene 2.4-dev (r691741) 03-Sep-2008 (yonik)
+27. Replaced the StAX reference implementation with the geronimo
+    StAX API jar, and the Woodstox StAX implementation. (yonik)
 
 Build
  1. SOLR-411.  Changed the names of the Solr JARs to use the defacto standard JAR names based on
diff --git a/build.xml b/build.xml
index 6990adac963..42f80d27062 100644
--- a/build.xml
+++ b/build.xml
@@ -305,7 +305,8 @@
     </fileset>
     <fileset dir="${lib}">
       <include name="commons-io-*.jar" />
-      <include name="stax-*.jar" />
+      <include name="*stax-*.jar" />
+      <include name="wstx-*.jar" />
     </fileset>
     <pathelement location="${dest}/common"/>
   </path>
@@ -597,7 +598,8 @@
       <fileset dir="${lib}">
         <include name="commons-codec-*.jar"/>
         <include name="commons-io-*.jar"/>
-        <include name="stax-*.jar"/>
+        <include name="*stax-*.jar" />
+        <include name="wstx-*.jar" />
       </fileset>
       <fileset dir="${solrj-dir}/lib">
         <include name="*.jar" />
diff --git a/lib/geronimo-stax-api_1.0_spec-1.0.1.jar b/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
new file mode 100755
index 00000000000..77da03b5bd6
--- /dev/null
+++ b/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
@@ -0,0 +1,2 @@
+AnyObjectId[ab1ee3ba605df11b3075677c808d092845dad123] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/stax-1.2.0.jar b/lib/stax-1.2.0.jar
deleted file mode 100644
index e66750f8ed2..00000000000
--- a/lib/stax-1.2.0.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[0df112a9887409a4ef57cb3af76d641a4daaf4ca] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/stax-api-1.0.1.jar b/lib/stax-api-1.0.1.jar
deleted file mode 100644
index 0351397df37..00000000000
--- a/lib/stax-api-1.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[d9a1665151cf5ba827d15f9bccc35dc77b57cf98] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/wstx-asl-3.2.7.jar b/lib/wstx-asl-3.2.7.jar
new file mode 100755
index 00000000000..8bf9769fe0c
--- /dev/null
+++ b/lib/wstx-asl-3.2.7.jar
@@ -0,0 +1,2 @@
+AnyObjectId[277701703f09f05b322140a6bbb338e3a4833a19] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file