diff --git a/python-virtualenv.changes b/python-virtualenv.changes
index d1ca795..5ff6fd6 100644
--- a/python-virtualenv.changes
+++ b/python-virtualenv.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul 19 13:23:02 UTC 2011 - saschpe@suse.de
+
+- Spec file cleanup:
+  * Remove she-bang line from non-executable script (rpmlint warning)
+  * Remove in-tree libraries (setuptools, pip & distribute)
+  * Don't package PKG-INFO but AUTHORS.txt and LICENSE.txt
+
 -------------------------------------------------------------------
 Sun Jul 17 00:12:42 UTC 2011 - alexandre@exatati.com.br
 
diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index 296ccc8..54eaae7 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -15,28 +15,25 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%define mod_name virtualenv
-
-Name:           python-%{mod_name}
+Name:           python-virtualenv
 Version:        1.6.3
 Release:        1
-Url:            http://www.virtualenv.org
+Url:            http://www.virtualenv.org/
 Summary:        Virtual Python Environment builder
 License:        MIT
 Group:          Development/Languages/Python
-Source:         %{mod_name}-%{version}.tar.bz2
+Source:         virtualenv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
+Requires:       python-distribute
+Requires:       python-pip
 %if 0%{?suse_version}
 %py_requires
 %if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
 %endif
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 virtualenv is a tool to create isolated Python environments.
@@ -61,10 +58,11 @@ virtualenv environments (and optionally doesnt use the globally installed
 libraries either).
 
 %prep
-%setup -q -n %{mod_name}-%{version}
+%setup -q -n virtualenv-%{version}
+rm virtualenv_support/*.{egg,gz} # Remove in-tree libraries that are available as packages too
+sed -i "1d" virtualenv.py # Remove she-bang line for non-executable script
 
 %build
-export CFLAGS="%{optflags}"
 python setup.py build
 
 %install
@@ -75,8 +73,8 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc PKG-INFO docs
-%python_sitelib/%{mod_name}*
-%{_bindir}/%{mod_name}
+%doc AUTHORS.txt LICENSE.txt docs
+%{_bindir}/virtualenv
+%{python_sitelib}/virtualenv*
 
 %changelog
diff --git a/virtualenv-1.6.3.tar.gz b/virtualenv-1.6.3.tar.gz
new file mode 100644
index 0000000..20c9c94
--- /dev/null
+++ b/virtualenv-1.6.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca9d207c0ac4f74e728c1e54fcd9041f257d2409ccfd5a1c889cdf0dfb5b18ad
+size 1888986