diff --git a/.cvsignore b/.cvsignore
index f384453..64385ef 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,5 @@
 eclipse-cdt-autotools-0.9.0.tar.gz
 eclipse-cdt-autotools-0.9.1.tar.gz
 eclipse-cdt-fetched-src-4_0_0.tar.bz2
+eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
+eclipse-cdt-fetched-src-autotools-0_9_1.tar.gz
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 094b215..ba04ba7 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -37,11 +37,11 @@ Requires:       eclipse-platform
 #   -buildfile build.xml -DbaseLocation=/usr/share/eclipse \
 #   -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
 #   -DdontUnzip=true fetch
-# cd .. && tar jcf eclipse-cdt-fetched-src-4_0_0.tar.bz2 org.eclipse.cdt.releng
+# cd .. && tar jcf eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2 org.eclipse.cdt.releng
 
-Source0: %{name}-fetched-src-%{version}.tar.bz2
+Source0: %{name}-fetched-src-CDT_4_0_0.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-0.9.1.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_1.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -331,7 +331,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
-* Tue Jul 17 2007 Jeff Johnston <jjohnstn@redhat.com> 4.0.0-1
+* Thu Jul 19 2007 Jeff Johnston <jjohnstn@redhat.com> 4.0.0-1
 - Rebase to CDT 4.0.0
 - Rebase Autotools to 0.9.1
 
diff --git a/make-autotools-tarball.sh b/make-autotools-tarball.sh
index 692ac51..1013e25 100755
--- a/make-autotools-tarball.sh
+++ b/make-autotools-tarball.sh
@@ -3,7 +3,7 @@ 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
+cvs -d:pserver:anonymous@sources.redhat.com:/cvs/eclipse export -r $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*
+tar -czvf eclipse-cdt-fetched-src-$tag.tar.gz com.redhat.eclipse.cdt.autotools*
 
diff --git a/sources b/sources
index 5cdad8f..f883232 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-6c04b9ace73a4861ff7d9e67977b6f75  eclipse-cdt-autotools-0.9.1.tar.gz
-694b0b78710bbdfc323c19a337f73a28  eclipse-cdt-fetched-src-4.0.0.tar.bz2
+6b7da0a33b609651ca7e5da63090d111  eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
+d9716ef78e9bc1ee511eece3c6aeec12  eclipse-cdt-fetched-src-autotools-0_9_1.tar.gz