diff --git a/.cvsignore b/.cvsignore
index 5ac50fe..d08db8d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mutagen-1.15.tar.gz
+mutagen-1.16.tar.gz
diff --git a/import.log b/import.log
index 45ddd81..4f69f33 100644
--- a/import.log
+++ b/import.log
@@ -1,2 +1,3 @@
 python-mutagen-1_15-1_fc10:HEAD:python-mutagen-1.15-1.fc10.src.rpm:1238937627
 python-mutagen-1_15-2_fc10:HEAD:python-mutagen-1.15-2.fc10.src.rpm:1239346187
+python-mutagen-1_16-1_fc10:HEAD:python-mutagen-1.16-1.fc10.src.rpm:1246597201
diff --git a/python-mutagen.spec b/python-mutagen.spec
index 21ad901..c4c0445 100644
--- a/python-mutagen.spec
+++ b/python-mutagen.spec
@@ -1,14 +1,14 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-mutagen
-Version:        1.15
-Release:        2%{?dist}
+Version:        1.16
+Release:        1%{?dist}
 Summary:        Mutagen is a Python module to handle audio metadata
 
 Group:          Development/Languages
 License:        GPLv2
-URL:            http://code.google.com/p/quodlibet/wiki/Mutagen
-Source0:        http://quodlibet.googlecode.com/files/mutagen-%{version}.tar.gz
+URL:            http://code.google.com/p/mutagen
+Source0:        http://mutagen.googlecode.com/files/mutagen-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,32 +24,42 @@ includes a module to handle generic Ogg bitstreams.
 
 %prep
 %setup -q -n mutagen-%{version}
+# Fix non-executable-script error
 sed -i '/^#! \/usr\/bin\/env python/,+1 d' mutagen/__init__.py
+# Fix wrong-file-end-of-line-encoding warning
 sed -i 's/\r//' TUTORIAL
 
 %build
 %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc API-NOTES COPYING NEWS README TODO TUTORIAL
 %{_bindir}/*
 %{_mandir}/man*/*gz
-%{python_sitelib}/*
+%{python_sitelib}/mutagen
+%{python_sitelib}/mutagen-%{version}-*.egg-info
 
 %changelog
-* Fri Apr 10 2009 Silas Sewell <silas at sewell ch> - 1.15-2
+* Thu Jul 02 2009 Silas Sewell <silas@sewell.ch> - 1.16-1
+- Update to 1.16
+- New project URLs
+
+* Sun Apr 12 2009 Silas Sewell <silas@sewell.ch> - 1.15-3
+- Normalize spec
+
+* Fri Apr 10 2009 Silas Sewell <silas@sewell.ch> - 1.15-2
 - Make sed safer
 - Add back in removed changelogs
 
-* Sun Mar 29 2009 Silas Sewell <silas at sewell ch> - 1.15-1
+* Sun Mar 29 2009 Silas Sewell <silas@sewell.ch> - 1.15-1
 - Update to 1.15
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-4
diff --git a/sources b/sources
index f921021..8939bbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c346e1290711a38c123727c31f3602f8  mutagen-1.15.tar.gz
+feea89bebee5816aed911f33a2171559  mutagen-1.16.tar.gz