diff --git a/.cvsignore b/.cvsignore
index b392a5f..85c025f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sos-1.9.tar.gz
+sos-2.1.tar.gz
diff --git a/sos.spec b/sos.spec
index 15b1f8e..52ce171 100644
--- a/sos.spec
+++ b/sos.spec
@@ -2,8 +2,8 @@
 
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
-Version: 1.9
-Release: 3%{?dist}
+Version: 2.1
+Release: 0%{?dist}
 Group: Applications/System
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -45,11 +45,24 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/%{name}
 %{python_sitelib}/*
 %{_mandir}/man1/*
-%doc README README.rh-upload TODO LICENSE ChangeLog doc/*
+%{_mandir}/man5/*
+%doc README TODO LICENSE ChangeLog doc/*
 %config(noreplace) %{_sysconfdir}/sos.conf
 
 %changelog
-* Fri Mar 26 2010 Adam Stokes <ajs at redhat dot com> = 1.9-3
+* Thu Apr 22 2010 Adam Stokes <ajs at redhat dot com> = 2.1-0
+- Include --help in manpage
+- If tmp-dir is defined then put compressed archive there
+
+* Sun Apr 11 2010 Adam Stokes <ajs at redhat dot com> = 2.0-0
+- Bump release to 2
+- Fix problem where sos generates error on newline in hostname
+- Remove references to sysreport*
+
+* Tue Mar 30 2010 Adam Stokes <ajs at redhat dot com> = 1.9-5
+- Remove references to rh-upload
+
+* Fri Mar 26 2010 Adam Stokes <ajs at redhat dot com> = 1.9-4
 - fix setup.py to autocompile translations and man pages
 
 * Fri Mar 19 2010 Adam Stokes <ajs at redhat dot com> = 1.9-2
diff --git a/sources b/sources
index be0f7bb..09f21b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8158cb99e40eedbe745497d99fba446  sos-1.9.tar.gz
+f17ec8a0d8c8fdf804394642492912e9  sos-2.1.tar.gz