diff --git a/.cvsignore b/.cvsignore
index bec0817..e4e5bcf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -15,3 +15,5 @@ eclipse-cdt-fetched-src-autotools-0_9_6.tar.gz
 eclipse-cdt-fetched-src-cdt_5_0.tar.bz2
 eclipse-cdt-fetched-src-autotools-1_0_0.tar.gz
 eclipse-cdt-fetched-src-CDT_5_0_0.tar.bz2
+eclipse-cdt-fetched-src-autotools-1_0_1.tar.gz
+eclipse-cdt-fetched-src-libhover-1_0_0.tar.gz
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 81e099a..cb07d59 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -20,7 +20,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -34,7 +34,9 @@ Requires:       eclipse-platform
 Source0: %{name}-fetched-src-CDT_5_0_0.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-1_0_0.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-1_0_1.tar.gz
+
+Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-1_0_0.tar.gz
 
 ## The following tarball was generated thusly:
 ##
@@ -57,12 +59,6 @@ Source5: %{name}-runtests.sh
 # Don't run the tests as part of the build.  We'll do this ourselves.
 Patch4: %{name}-no-tests-%{version}.patch
 
-# Fix autotools plugin to reference correct project nature.
-Patch5: %{name}-autotools-plugin.patch
-
-# Fix for autotools property settings problem.
-Patch6: %{name}-autotools-bug461647.patch
-
 ## Patch to cppunit code to support double-clicking on file names, classes, and
 ## member names in the Hierarchy and Failure views such that the appropriate
 ## file will be opened and the appropriate line will be selected.
@@ -206,13 +202,14 @@ popd
 
 ## Autotools stuff
 mkdir autotools
-
 pushd autotools
 tar -xzf %{SOURCE1}
-pushd com.redhat.eclipse.cdt.autotools
-%patch5
-%patch6
 popd
+
+## Libhover stuff
+mkdir libhover
+pushd libhover
+tar -xzf %{SOURCE2}
 popd
 
 ## Cppunit stuff
@@ -297,7 +294,26 @@ java -cp $SDK/startup.jar \
      -application org.eclipse.ant.core.antRunner \
      -Duser.home=$homedir                        \
      -Dtype=feature                                    \
-     -Did=com.redhat.eclipse.cdt.autotools.feature         \
+     -Did=org.eclipse.linuxtools.cdt.autotools.feature \
+     -DsourceDirectory=$(pwd)                          \
+     -DbaseLocation=$SDK                               \
+     -Dbuilder=$PDEDIR/templates/package-build  \
+     -f $PDEDIR/scripts/build.xml 
+popd
+
+## Libhover build
+pushd libhover
+java -cp $SDK/startup.jar \
+     -Duser.home=$homedir                        \
+     -XX:CompileCommand="exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" \
+     -XX:CompileCommand="exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>" \
+     -XX:CompileCommand="exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" \
+     -XX:CompileCommand="exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" \
+     org.eclipse.core.launcher.Main             \
+     -application org.eclipse.ant.core.antRunner \
+     -Duser.home=$homedir                        \
+     -Dtype=feature                                    \
+     -Did=org.eclipse.linuxtools.cdt.libhover.feature  \
      -DsourceDirectory=$(pwd)                          \
      -DbaseLocation=$SDK                               \
      -Dbuilder=$PDEDIR/templates/package-build  \
@@ -348,7 +364,12 @@ done
 
 # Autotools install
 pushd autotools
-unzip -qq -d $installDir build/rpmBuild/com.redhat.eclipse.cdt.autotools.feature.zip
+unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.autotools.feature.zip
+popd
+
+# Libhover install
+pushd libhover
+unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.feature.zip
 popd
 
 mkdir -p $mylynInstallDir/eclipse/features $mylynInstallDir/eclipse/plugins
@@ -528,6 +549,10 @@ fi
 %endif
 
 %changelog
+* Wed Oct 15 2008 Jeff Johnston <jjohnstn@redhat.com> 5.0.0-7
+- Change to use new linuxtools version of autotools-1.0.1.
+- Add build of libhover plugins again from linuxtools.
+
 * Tue Sep 09 2008 Jeff Johnston <jjohnstn@redhat.com> 5.0.0-6
 - Fix for NPE during alteration of Autotools configuration settings.
 - Resolves #461647
diff --git a/make-autotools-tarball.sh b/make-autotools-tarball.sh
index 1013e25..558fd22 100755
--- a/make-autotools-tarball.sh
+++ b/make-autotools-tarball.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
 rel=$1
 tag=`echo $rel | sed -e 's/\./_/g'`
+echo $tag
 mkdir -p temp && cd temp
 rm -rf autotools
-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
+svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/tags/$rel autotools
 cd autotools
-tar -czvf eclipse-cdt-fetched-src-$tag.tar.gz com.redhat.eclipse.cdt.autotools*
+pwd
+rm -rf org.eclipse.linuxtools.cdt.autotools.tests
+tar -czvf eclipse-cdt-fetched-src-autotools-$tag.tar.gz org.eclipse.linuxtools.cdt.autotools*
 
diff --git a/sources b/sources
index f003bfb..7e71724 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-c1fb4f28bd7cd3e4873229a94b8ee5fa  eclipse-cdt-fetched-src-autotools-1_0_0.tar.gz
 8958a138a5d96c9c1fa892e895b29bcd  eclipse-cdt-fetched-src-CDT_5_0_0.tar.bz2
+97035338f49f40212ad411ee43065939  eclipse-cdt-fetched-src-autotools-1_0_1.tar.gz
+3c0f7f6b7d1686e5aa360762b6c8b379  eclipse-cdt-fetched-src-libhover-1_0_0.tar.gz