diff --git a/python-mutagen.spec b/python-mutagen.spec
index 7a9547e..de65172 100644
--- a/python-mutagen.spec
+++ b/python-mutagen.spec
@@ -8,7 +8,7 @@
 
 Name:           python-%{realname}
 Version:        1.31
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mutagen is a Python module to handle audio meta-data
 
 Group:          Development/Languages
@@ -61,14 +61,23 @@ popd
 %endif
 
 %install
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__install} -d %{buildroot}%{_mandir}/man1
-%{__install} -p -m 0644 man/*.1 %{buildroot}%{_mandir}/man1
-
 %if %{with python3}
 pushd %{py3dir}
 %{__python3} setup.py install --skip-build --root %{buildroot}
 popd
+for file in mid3cp mid3iconv mid3v2 moggsplit mutagen-inspect mutagen-pony ; do
+mv %{buildroot}%{_bindir}/$file ./$file.py3
+done
+%endif
+
+%{__python} setup.py install --skip-build --root %{buildroot}
+%{__install} -d %{buildroot}%{_mandir}/man1
+%{__install} -p -m 0644 man/*.1 %{buildroot}%{_mandir}/man1
+
+%if %{with python3}
+for file in mid3cp mid3iconv mid3v2 moggsplit mutagen-inspect mutagen-pony ; do
+mv ./$file.py3 %{buildroot}%{_bindir}/$file
+done
 %endif
 
 %check
@@ -86,19 +95,31 @@ pushd %{py3dir}
 %files
 %defattr(-,root,root,-)
 %doc COPYING NEWS README.rst docs/tutorial.rst docs/api_notes.rst docs/bugs.rst
+%if !%{with python3}
 %{_bindir}/m*
 %{_mandir}/*/*
+%endif
 %{python_sitelib}/%{realname}
 %{python_sitelib}/%{realname}-%{version}-*.egg-info
 
 %if %{with python3}
 %files -n python3-%{realname}
 %doc COPYING NEWS README.rst docs/tutorial.rst docs/api_notes.rst docs/bugs.rst
+%if %{with python3}
+%{_bindir}/m*
+%{_mandir}/*/*
+%endif
 %{python3_sitelib}/%{realname}
 %{python3_sitelib}/%{realname}*.egg-info
 %endif
 
 %changelog
+* Mon Nov  9 2015 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.31-2
+- Move the scripts to the python3 package.  This fixes two issues:
+  * The scripts couldn't work without manual intervention because they required
+    the python3 versions the library but no dep existed to bring them in.
+  * The python2 version of the package required /usr/bin/python3
+
 * Thu Sep 10 2015 Michele Baldessari <michele@acksyn.org> - 1.31-1
 - New upstream release