diff --git a/.cvsignore b/.cvsignore
index a4a90fa..423a1ef 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cppad-20090303.0.gpl.tgz
+cppad-20100101.0.gpl.tgz
diff --git a/cppad.spec b/cppad.spec
index b8c8682..5c1b2d0 100644
--- a/cppad.spec
+++ b/cppad.spec
@@ -1,7 +1,3 @@
-# ----------------------------------------------------------------------------
-# RPM source for this version of cppad.spec:
-# http://www.seanet.com/~bradbell/cppad/cppad-%{version}-%{release}.fc7.src.rpm
-# ----------------------------------------------------------------------------
 # Known Problems: 
 #
 # After installation of cppad-doc-%{version} the command
@@ -15,8 +11,8 @@
 # ---------------------------------------------------------------------------- 
 
 Name: cppad
-Version: 20090303.0
-Release: 5%{?dist}
+Version: 20100101.0
+Release: 1%{?dist}
 Summary: No base package is installed, see %{name}-devel 
 
 Group: Development/Libraries 
@@ -62,47 +58,6 @@ 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
@@ -115,9 +70,6 @@ int main(void)\\
 EOF
 sed -i.stamp example/example.cpp -f example.sed
 
-# See Sat Jan 12 2008  log entry
-sed -i.stamp speed/example/example.cpp -e '/Run(speed_test,/d'
-
 # Remove setting of permissions in documentation destination directory.
 # Create the doc_prefix directory (if it does not already exist).
 # (Note we are not using a postfix directory, so can overwrite its case.)
@@ -140,11 +92,16 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %check
 example/example 
 test_more/test_more
-speed/cppad/cppad     correct 123 true
-speed/cppad/cppad     correct 123 false
-speed/double/double   correct 123 true
 speed/example/example
-speed/profile/profile correct 123 true
+speed/double/double   correct 123
+speed/cppad/cppad     correct 123
+speed/cppad/cppad     correct 123 optimize
+speed/cppad/cppad     correct 123 retape
+speed/cppad/cppad     correct 123 optimize retape
+speed/profile/profile correct 123
+speed/profile/profile correct 123 optimize
+speed/profile/profile correct 123 retape
+speed/profile/profile correct 123 optimize retape
 
 %clean
 # cleanup 
@@ -161,6 +118,13 @@ rm -rf $RPM_BUILD_ROOT
 
 # ----------------------------------------------------------------------------
 %changelog
+* Sat Jan 01 2010 Brad Bell <bradbell at seanet dot com> - 20100101.0-1
+- Use new upstream source.
+- Remove out of date comment about where this spec file is maintained.
+- Remove patches that are no longer necessary in prep section.
+- Change calling sequence for correctness of speed tests (we do not run speed
+- tests, that requires a computer with no other processes running).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20090303.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index d89508f..57369ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d34e093cb4b59b87b73a1b38597e45ac  cppad-20090303.0.gpl.tgz
+4886174196fbd7745f30ec3c320a6975  cppad-20100101.0.gpl.tgz