diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0b7a4f3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: cppad
-# $Id$
-NAME := cppad
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/cppad.spec b/cppad.spec
index 4c65684..8ee4fbe 100644
--- a/cppad.spec
+++ b/cppad.spec
@@ -16,7 +16,7 @@
 
 Name: cppad
 Version: 20090303.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: No base package is installed, see %{name}-devel 
 
 Group: Development/Libraries 
@@ -62,6 +62,47 @@ as a single web page, in both html and xml, can be found at that web site.
 %prep
 %setup -q 
 
+# Patch problems fix in trunk on 20090606, but not yet in any release
+# This grep should fail once the version passes 20090606
+grep 'x\[2\] = 5.0; x\[2\] = 5.0;' test_more/jacobian.cpp
+# This patch will no longer be needed once the version passes 20090606
+sed -i.stamp test_more/jacobian.cpp \
+	-e 's/x\[2\] = 5.0; x\[2\] = 5.0;/x[1] = 5.0; x[2] = 5.0;/'
+# This patch will no longer be needed once the version passes 20090606
+sed -i.stamp cppad/local/default.hpp \
+	-e 's/AD<Base>::AD(void) :/& value_(Base(0)), /'
+
+# This patch will no longer be needed once branches/sweep is merged into
+# the CppAD trunk (date is as yet unknown).
+sed -i.stamp cppad/local/fun_construct.hpp \
+	-e '/for(i = 0; i < m; i++)/,$d'
+cat << EOF >> cppad/local/fun_construct.hpp
+# ifndef NDEBUG
+	for(i = 0; i < m; i++) if( taylor_[dep_taddr_[i]] != y[i].value_ )
+	{	using std::endl;
+		std::ostringstream buf;
+		buf << "A dependent variable value is not equal to "
+		    << "its tape evaluation value (perhaps it is nan)" << endl
+		    << "Dependent variable value = " 
+		    <<  y[i].value_ << endl
+		    << "Tape evaluation value    = " 
+		    <<  taylor_[dep_taddr_[i]]  << endl
+		    << "Difference               = " 
+		    <<  y[i].value_ -  taylor_[dep_taddr_[i]]  << endl
+		;
+		CPPAD_ASSERT_KNOWN(
+			0,
+			buf.str().c_str()
+		);
+	}
+# endif
+}
+
+} // END CppAD namespace
+
+# endif
+EOF
+
 # change example/example.cpp to print out machine epsilon 
 cat << EOF > example.sed
 /^int main(void)/N
@@ -120,12 +161,21 @@ rm -rf $RPM_BUILD_ROOT
 
 # ----------------------------------------------------------------------------
 %changelog
-* Mon Mar 30 2009 Brad Bell <bradbell at seanet do com> 20080303-2
+* Sat Jun 20 2009 Brad Bell <bradbell at seanet dot com> 20090303-4
+- Patch cppad/local/fun_construct.hpp to give a more useful error message
+- (so we can figure out why the Fedora 11 build is failing).
+
+* Mon Jun 06 2009 Brad Bell <bradbell at seanet dot com> 20090303-3
+- Patch file test_more/jacobian.cpp (required for versions below 20090606).
+- Patch file cppad/local/default.hpp (required for versions below 20090606).
+- Fix version (change 20080303 to 20090303) in previous two log entries.
+
+* Mon Mar 30 2009 Brad Bell <bradbell at seanet dot com> 20090303-2
 - Change tabs to spaces in spec file to avoid an rpmlint warning.
 - The base package in previous release had no files, hence did not exist.
 - Use Provides: in cppad-devel to indicate that it provides cppad.
 
-* Sun Mar 29 2009 Brad Bell <bradbell at seanet dot com> 20080303-1
+* Sun Mar 29 2009 Brad Bell <bradbell at seanet dot com> 20090303-1
 - Change to newer version of cppad.
 - Create a base package that requres both devel and doc sub-packages