diff --git a/eclipse-cdt-autotools-bug280117.patch b/eclipse-cdt-autotools-bug280117.patch
new file mode 100644
index 0000000..f166f35
--- /dev/null
+++ b/eclipse-cdt-autotools-bug280117.patch
@@ -0,0 +1,13 @@
+diff -up ./src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java.fix ./src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java
+--- ./src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java.fix	2009-06-15 15:41:38.000000000 -0400
++++ ./src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java	2009-06-15 15:42:10.000000000 -0400
+@@ -105,8 +105,8 @@ public class AutotoolsScannerInfo implem
+ 					String id = options[i].getId();
+ 					if (id.indexOf("builddir") > 0) { // $NON-NLS-1$
+ 						runPath = makefile.getProject().getLocation().append(value.trim());
++						done = true;
+ 					}
+-					done = true;
+ 				}
+ 			} catch (BuildException e) {
+ 				// do nothing
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 6b7a7b1..97832a3 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:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -94,6 +94,10 @@ Patch15: %{name}-managedConfigurations.patch
 # the .cproject file.  This patch prevents the problem.
 Patch16: %{name}-managedConfigurations-fix.patch
 
+# Following is a patch for Eclipse bug 280117 which fixes the Autotools
+# ScannerInfo.
+Patch17: %{name}-autotools-bug280117.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 %if %{gcj_support}
@@ -222,6 +226,9 @@ popd
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
+pushd org.eclipse.linuxtools.cdt.autotools
+%patch17 -p0
+popd
 popd
 
 ## Libhover stuff
@@ -566,6 +573,9 @@ fi
 %endif
 
 %changelog
+* Mon Jun 15 2009 Jeff Johnston <jjohnstn@redhat.com> 5.0.2-3
+- Resolves #280117.
+
 * Wed Apr 08 2009 Jeff Johnston <jjohnstn@redhat.com> 5.0.2-2
 - Bump release.