diff --git a/python-pmw.spec b/python-pmw.spec
index b0ca2cc..864a08c 100644
--- a/python-pmw.spec
+++ b/python-pmw.spec
@@ -49,26 +49,29 @@ widgets, paned widgets, scrolled widgets and dialog windows.
 
 %prep
 %autosetup -n Pmw-%{version}
-pushd Pmw/Pmw_2_0_0
-find . -name "*.py" -print0 | xargs -0 sed -i "s|tkinter|Tkinter|g"
-popd
+mkdir -p ../python3
+cp -a * ../python3
 
 %build
 %py2_build
+pushd ../python3
 %py3_build
+popd
 
 %install
 %py2_install
+pushd ../python3
 %py3_install
+popd
 
 # file fixes
 chmod 644 ${RPM_BUILD_ROOT}%{python2_sitelib}/Pmw/Pmw_1_3_3/lib/Pmw.def
 chmod 644 ${RPM_BUILD_ROOT}%{python2_sitelib}/Pmw/Pmw_1_3_3/contrib/README
 chmod 644 ${RPM_BUILD_ROOT}%{python2_sitelib}/Pmw/Pmw_1_3_3/tests/flagup.bmp
-chmod 644 ${RPM_BUILD_ROOT}%{python2_sitelib}/Pmw/Pmw_1_3_3/doc/*
+chmod 644 Pmw/Pmw_1_3_3/doc/*
+chmod 644 Pmw/Pmw_2_0_0/doc/*
 
 dos2unix --keepdate ${RPM_BUILD_ROOT}%{python2_sitelib}/Pmw/Pmw_1_3_3/bin/bundlepmw.py
-dos2unix --keepdate ${RPM_BUILD_ROOT}%{python2_sitelib}/Pmw/Pmw_2_0_0/bin/bundlepmw.py
 dos2unix --keepdate ${RPM_BUILD_ROOT}%{python2_sitelib}/Pmw/Pmw_1_3_3/contrib/*
 dos2unix --keepdate ${RPM_BUILD_ROOT}%{python2_sitelib}/Pmw/Pmw_1_3_3/demos/*
 dos2unix --keepdate ${RPM_BUILD_ROOT}%{python2_sitelib}/Pmw/Pmw_1_3_3/tests/*
@@ -95,6 +98,9 @@ for lib in ${RPM_BUILD_ROOT}%{python3_sitelib}/Pmw/$dir/*.py; do
 done
 done
 
+rm -rf %{buildroot}%{python2_sitelib}/Pmw/Pmw_2_0_0
+rm -rf %{buildroot}%{python3_sitelib}/Pmw/Pmw_1_3_3
+
 # Manually invoke the python byte compile macro for each path that needs byte
 # compilation.
 %py_byte_compile %{__python2} %{buildroot}%{python2_sitelib}/Pmw/Pmw_1_3_3/demos
@@ -107,17 +113,20 @@ done
 
 %files -n python2-%{srcname}
 %defattr(-,root,root,-)
-%doc %{python2_sitelib}/Pmw/Pmw_1_3_3/doc
+%doc Pmw/Pmw_1_3_3/doc
 %{python2_sitelib}/*egg-info
 %{python2_sitelib}/Pmw
 
 %files -n python3-%{srcname}
 %defattr(-,root,root,-)
-%doc %{python3_sitelib}/Pmw/Pmw_2_0_0/doc
+%doc Pmw/Pmw_2_0_0/doc
 %{python3_sitelib}/*egg-info
 %{python3_sitelib}/Pmw
 
 %changelog
+* Sat Jul 30 2016 Tim Fenn <tim.fenn@gmail.com> - 2.0.0-4
+- fix python2 vs python3 packaging
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-4
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages