diff --git a/.cvsignore b/.cvsignore
index 55727dd..1e9b3e7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,4 @@ eclipse-cdt-autotools-0.0.6.1.tar.gz
 eclipse-cdt-autotools-0.0.7.tar.gz
 eclipse-cdt-fetched-src-3.1.2.tar.bz2
 eclipse-cdt-autotools-0.0.8.tar.gz
+eclipse-cdt-autotools-0.0.8.1.tar.gz
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index b0380d7..efcf5a0 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -18,7 +18,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -42,16 +42,7 @@ Requires:       eclipse-platform
 
 Source0: %{name}-fetched-src-%{version}.tar.bz2
 
-# The following tarball was generated thusly:
-#
-# mkdir temp && cd temp
-# cvs -d:pserver:anonymous@sources.redhat.com:/cvs/eclipse export -r autotools-0_0_8 \
-#   autotools/com.redhat.eclipse.cdt.autotools autotools/com.redhat.eclipse.cdt.autotools-docs \
-#   autotools/com.redhat.eclipse.cdt.autotools.feature
-# cd autotools
-# tar -czvf eclipse-cdt-autotools-0.0.8.tar.gz com.redhat.eclipse.cdt.autotools*
-
-Source1: %{name}-autotools-0.0.8.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-0.0.8.1.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -314,6 +305,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html
 
 %changelog
+* Tue Feb 27 2007 Jeff Johnston <jjohnstn@redhat.com> 3.1.2-2
+- Resolves: #229891, #230253, #205310, #229893
+- Rebase autotools to 0.0.8.1 source.
+
 * Wed Feb 21 2007 Jeff Johnston <jjohnstn@redhat.com> 3.1.2-1
 - Rebase CDT to 3.1.2.
 - Rebase autotools to 0.0.8 source.
diff --git a/make-autotools-tarball.sh b/make-autotools-tarball.sh
new file mode 100755
index 0000000..692ac51
--- /dev/null
+++ b/make-autotools-tarball.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+rel=$1
+tag=`echo $rel | sed -e 's/\./_/g'`
+mkdir -p temp && cd temp
+rm -rf autotools
+cvs -d:pserver:anonymous@sources.redhat.com:/cvs/eclipse export -r autotools-$tag autotools/com.redhat.eclipse.cdt.autotools autotools/com.redhat.eclipse.cdt.autotools-docs autotools/com.redhat.eclipse.cdt.autotools.feature
+cd autotools
+tar -czvf eclipse-cdt-autotools-$rel.tar.gz com.redhat.eclipse.cdt.autotools*
+
diff --git a/sources b/sources
index 34fd82a..3ff0529 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 00ce7b1810685e56375f8df48cc9ae26  eclipse-cdt-fetched-src-3.1.2.tar.bz2
-6f9452ece766ef0b676942cd863c2c31  eclipse-cdt-autotools-0.0.8.tar.gz
+622927df0c7bc770dbb43579e3668fa9  eclipse-cdt-autotools-0.0.8.1.tar.gz