diff --git a/oggconvert.spec b/oggconvert.spec
index fc87fb6..c8fcc86 100644
--- a/oggconvert.spec
+++ b/oggconvert.spec
@@ -1,25 +1,21 @@
-# sitelib for noarch packages
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name:           oggconvert
 Version:        0.3.3
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Convert media files to Free formats
 
 Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://launchpad.net/oggconvert
-Source0:	http://oggconvert.tristanb.net/releases/%{version}/oggconvert-%{version}.tar.gz
-# Patch0: 	oggconvert-0.3.2-desktop.patch -- Not needed in 0.3.3
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	pygtk2 >= 2.10, pygtk2-libglade >= 2.10 
-Requires:	gstreamer >= 0.10.12, gstreamer-python, gstreamer-plugins-base
+Source0:        http://oggconvert.tristanb.net/releases/%{version}/oggconvert-%{version}.tar.gz
+
 BuildArch:      noarch
-BuildRequires:  python-devel
-BuildRequires:	pygtk2 >= 2.10, pygtk2-libglade >= 2.10
+BuildRequires:  python2-devel
+BuildRequires:  pygtk2 >= 2.10, pygtk2-libglade >= 2.10
 BuildRequires:  gstreamer >= 0.10.12, gstreamer-python, gstreamer-plugins-base
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
+Requires:       pygtk2 >= 2.10, pygtk2-libglade >= 2.10
+Requires:       gstreamer >= 0.10.12, gstreamer-python, gstreamer-plugins-base
 
 %description
 # Description from site
@@ -38,18 +34,15 @@ Finally, it adheres to the GNOME HIG as much as possible.
 
 %prep
 %setup -q
-# %patch0 -p1 - Not needed for 0.3.3
 
 %build
-# Remove CFLAGS=... for noarch packages (unneeded)
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-
+%py2_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%py2_install
+
 desktop-file-install --delete-original        \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications               \
+  --dir=%{buildroot}%{_datadir}/applications               \
   --add-category X-OutputGeneration                           \
   %{buildroot}/%{_datadir}/applications/oggconvert.desktop
 %find_lang %{name}
@@ -61,8 +54,8 @@ desktop-file-install --delete-original        \
 #
 # See http://www.freedesktop.org/software/appstream/docs/ for more details.
 #
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
+mkdir -p %{buildroot}%{_datadir}/appdata
+cat > %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <!--
@@ -96,23 +89,21 @@ SentUpstream: 2014-09-22
 </application>
 EOF
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-
-%doc README COPYING AUTHORS TODO ChangeLog PKG-INFO
-# For noarch packages: sitelib
-%{python_sitelib}/OggConvert/
+%license COPYING
+%doc README AUTHORS TODO ChangeLog PKG-INFO
+%{python2_sitelib}/OggConvert/
 %{_bindir}/oggconvert
 %{_datadir}/appdata/*%{name}.appdata.xml
 %{_datadir}/applications/*oggconvert.desktop
 %{_datadir}/pixmaps/oggconvert.svg
-%{python_sitelib}/oggconvert-%{version}-py?.?.egg-info
+%{python2_sitelib}/oggconvert-%{version}-py?.?.egg-info
 
 %changelog
+* Sat Jan 02 2016 Neal Gompa <ngompa13{%}gmail{*}com> - 0.3.3-12
+- Clean up spec to better match current Fedora guidelines
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild