diff --git a/.cvsignore b/.cvsignore
index f9ce854..0ffcc33 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-adplug-2.0.1.tar.bz2
-adplug.db
+adplug-2.1.tar.bz2
+adplugdb-2006-07-07.tar.gz
diff --git a/adplug.spec b/adplug.spec
index 0036243..2769c7b 100644
--- a/adplug.spec
+++ b/adplug.spec
@@ -1,14 +1,15 @@
 # SPEC file for AdPlug, primary target is the Fedora Extras
 # RPM repository.
 
+%define adplugdbver 2006-07-07
 Name:		adplug
-Version:	2.0.1
-Release:	2%{?dist}
+Version:	2.1
+Release:	1%{?dist}
 Summary:	A software library for AdLib (OPL2) emulation
 URL:		http://adplug.sourceforge.net/
 Group:		Applications/Multimedia
 Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1:	http://download.sourceforge.net/%{name}/adplug.db
+Source1:	http://download.sourceforge.net/%{name}/adplugdb-%{adplugdbver}.tar.gz
 Patch0:		adplug-1.5.1-texinfo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:	LGPL
@@ -44,6 +45,10 @@ This package contains development files for the AdPlug AdLib
 %setup -q
 # This removes the version.texi dependency
 %patch0 -p1
+tar xvfz %{SOURCE1}
+# Include these by different name
+mv %{adplugdbver}/README README.adplugdb
+mv %{adplugdbver}/NEWS NEWS.adplugdb
 
 %build
 %configure --disable-static --sharedstatedir=%{shareddata} --disable-rpath
@@ -55,7 +60,7 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 mkdir -p $RPM_BUILD_ROOT%{shareddata}/%{name}
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{shareddata}/%{name}
+install -p -m 644 %{adplugdbver}/adplug.db $RPM_BUILD_ROOT%{shareddata}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +85,7 @@ fi
 %{_bindir}/adplugdb
 %{_mandir}/man1/adplugdb.1*
 %doc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README TODO
+%doc NEWS.adplugdb README.adplugdb
 
 %files devel
 %defattr(-, root, root)
@@ -90,6 +96,9 @@ fi
 %{_infodir}/*.gz
 
 %changelog
+* Wed Apr 11 2007 Linus Walleij <triad@df.lth.se> 2.1-1
+- New upstream version.
+
 * Tue Aug 29 2006 Linus Walleij <triad@df.lth.se> 2.0.1-2
 - Rebuild for Fedora Extras 6.
 
diff --git a/sources b/sources
index 2713040..318ee1a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b3e469e3437d29a79a1ab5febe220f17  adplug-2.0.1.tar.bz2
-5cbd3df5537700f28c350dbe08695c28  adplug.db
+bc75cf9d1d2241e287e2eb80b84bd2cd  adplug-2.1.tar.bz2
+40a1cc1222c7318172ee3740c4269df3  adplugdb-2006-07-07.tar.gz