diff --git a/python-configobj.changes b/python-configobj.changes
index 695c198..9d9540d 100644
--- a/python-configobj.changes
+++ b/python-configobj.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 25 08:21:00 UTC 2012 - toddrme2178@gmail.com
+
+- Spec file cleanups
+
 -------------------------------------------------------------------
 Sun Feb  5 19:40:33 UTC 2012 - dimstar@opensuse.org
 
diff --git a/python-configobj.spec b/python-configobj.spec
index 8504f3b..16901a9 100644
--- a/python-configobj.spec
+++ b/python-configobj.spec
@@ -15,7 +15,8 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-Name:           python-configobj
+%define modname configobj
+Name:           python-%{modname}
 Version:        4.7.2
 Release:        0
 # FIXME: Change python-cofigobj-docs Obsoletes to < with next version update. Obsoletes introduced with version 4.7.2.
@@ -23,16 +24,17 @@ Url:            http://www.voidspace.org.uk/python/configobj.html
 Summary:        Config file reading, writing and validation
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
-Source:         http://pypi.python.org/packages/source/c/configobj/configobj-%{version}.tar.gz
+Source:         http://pypi.python.org/packages/source/c/%{modname}/%{modname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
 # There are no real docs!
-Provides:       python-configobj-docs = %{version}
-Obsoletes:      python-configobj-docs <= %{version}
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+Provides:       python-%{modname}-docs = %{version}
+Obsoletes:      python-%{modname}-docs <= %{version}
+%if 0%{?suse_version} <= 1110
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %else
 BuildArch:      noarch
+%py_requires
 %endif
 
 %description
@@ -55,7 +57,7 @@ It has lots of other features though:
  * Powerful ``unrepr`` mode for storing/retrieving Python data-types
 
 %prep
-%setup -q -n configobj-%{version}
+%setup -q -n %{modname}-%{version}
 
 %build
 python setup.py build
@@ -65,6 +67,8 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%{python_sitelib}/*
+%{python_sitelib}/%{modname}.py*
+%{python_sitelib}/validate.py*
+%{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info
 
 %changelog