diff --git a/.cvsignore b/.cvsignore
index b858574..13c425e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-rpmdevtools-6.0.tar.bz2
 spectool-1.0.9.tar.bz2
+rpmdevtools-6.1.tar.bz2
diff --git a/rpmdevtools.spec b/rpmdevtools.spec
index 1e2595d..e6370fb 100644
--- a/rpmdevtools.spec
+++ b/rpmdevtools.spec
@@ -3,12 +3,13 @@
 %define spectool_version   1.0.9
 
 Name:           rpmdevtools
-Version:        6.0
+Version:        6.1
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
-License:        GPL
+# rpmdev-setuptree is GPLv2, everything else GPLv2+
+License:        GPLv2+ and GPLv2
 URL:            http://fedoraproject.org/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
@@ -110,6 +111,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 6.1-1
+- Sync COPYING with http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+
+* Mon Aug  6 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Work around #250990 in rpmls and rpmdev-extract.
+- Clarify copyright info of rpmdev-* and rpmls.
+
+* Sat Jul  7 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.
+- The long form of the list option in rmdevelrpms is --list-only, not --list.
+
 * Thu Jul  5 2007 Ville Skyttä <ville.skytta at iki.fi> - 6.0-1
 - Remove check-{buildroot,rpaths*}, now included in rpm-build >= 4.4.2.1.
 - Drop explicit dependency on patch, pulled in by recent rpm-build.
diff --git a/sources b/sources
index f67da29..5c7ff48 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7582b4f7c8ab6121b57ae2807a40c6ec  rpmdevtools-6.0.tar.bz2
 b3563111a44656efd3a2d9b44b830562  spectool-1.0.9.tar.bz2
+3d5e2747d1955bb902127b4d9ded30a0  rpmdevtools-6.1.tar.bz2