diff --git a/build/org.eclipse.cdt.autotools.tests/ChangeLog b/build/org.eclipse.cdt.autotools.tests/ChangeLog
index 7d06216d7ed..985943a50f9 100644
--- a/build/org.eclipse.cdt.autotools.tests/ChangeLog
+++ b/build/org.eclipse.cdt.autotools.tests/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* src/org/eclipse/cdt/autotools/tests/ProjectTools.java
+	(setup): Fix to return false when Workbench is null.
+
+2012-03-30  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* zip/project2.zip: Fix autogen.sh to make the configure script executable.
+	
 2012-03-29  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* src/org/eclipse/cdt/autotools/tests/ProjectTools.java (build): Refresh the workspace root so resource tests
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java
index a890eb0a676..579b684783e 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java
+++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java
@@ -59,19 +59,19 @@ public class ProjectTools {
      */
 	public static boolean setup() throws Exception {
 		if (!setupComplete) {
-        IWorkspaceDescription desc;
-        workspace = ResourcesPlugin.getWorkspace();
-        root = workspace.getRoot();
-        monitor = new NullProgressMonitor();
-        if(workspace == null) {
-        	return false;
-        }
-        if(root == null) {
-        	return false;
-        }
-        desc = workspace.getDescription();
-        desc.setAutoBuilding(false);
-        workspace.setDescription(desc);
+			IWorkspaceDescription desc;
+			workspace = ResourcesPlugin.getWorkspace();
+			if (workspace == null) {
+				return false;
+			}
+			root = workspace.getRoot();
+			monitor = new NullProgressMonitor();
+			if (root == null) {
+				return false;
+			}
+			desc = workspace.getDescription();
+			desc.setAutoBuilding(false);
+			workspace.setDescription(desc);
 		}
 		setupComplete = true;
 		return true;
diff --git a/build/org.eclipse.cdt.autotools.tests/zip/project2.zip b/build/org.eclipse.cdt.autotools.tests/zip/project2.zip
index 98319d436e7..6ebfb35f032 100644
Binary files a/build/org.eclipse.cdt.autotools.tests/zip/project2.zip and b/build/org.eclipse.cdt.autotools.tests/zip/project2.zip differ