diff --git a/python-Pygments.changes b/python-Pygments.changes
index 822da69..8452892 100644
--- a/python-Pygments.changes
+++ b/python-Pygments.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May  3 08:40:02 UTC 2012 - toddrme2178@gmail.com
+
+- Removed files with non-oss license, see bnc#760344
+- Cleanups in python 2 and python 3 spec files
+
 -------------------------------------------------------------------
 Mon Apr 30 13:06:58 UTC 2012 - toddrme2178@gmail.com
 
diff --git a/python-Pygments.spec b/python-Pygments.spec
index 5ee4472..368dcfd 100644
--- a/python-Pygments.spec
+++ b/python-Pygments.spec
@@ -15,15 +15,15 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-Name:           python-Pygments
+%define modname Pygments
+Name:           python-%{modname}
 Version:        1.5
 Release:        0
 Url:            http://pygments.org
 Summary:        Pygments is a syntax highlighting package written in Python
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
-Source:         http://pypi.python.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz
+Source:         http://pypi.python.org/packages/source/P/%{modname}/%{modname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
 BuildRequires:  python-distribute
@@ -53,7 +53,12 @@ source code. Highlights are:
  * ... and it highlights even Brainfuck!
 
 %prep
-%setup -q -n Pygments-%{version}
+%setup -q -n %{modname}-%{version}
+# remove non-oss licensed files, see bnc# 760344
+rm tests/examplefiles/Sorting.mod
+rm tests/examplefiles/test.mod
+rm tests/examplefiles/output/Sorting.mod
+rm tests/examplefiles/output/test.mod
 
 %build
 python setup.py build
@@ -69,7 +74,8 @@ nosetests
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGES TODO docs/build
 %{_bindir}/pygmentize
-%{python_sitelib}/*
 %{_mandir}/man1/pygmentize.1*
+%{python_sitelib}/pygments/
+%{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info/
 
 %changelog
diff --git a/python3-Pygments.changes b/python3-Pygments.changes
index 7933c59..73357eb 100644
--- a/python3-Pygments.changes
+++ b/python3-Pygments.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May  3 08:40:02 UTC 2012 - toddrme2178@gmail.com
+
+- Removed files with non-oss license, see bnc#760344
+- Cleanups in python 2 and python 3 spec files
+
 -------------------------------------------------------------------
 Mon Apr 30 13:06:58 UTC 2012 - toddrme2178@gmail.com
 
diff --git a/python3-Pygments.spec b/python3-Pygments.spec
index 855253a..1a5442a 100644
--- a/python3-Pygments.spec
+++ b/python3-Pygments.spec
@@ -15,22 +15,22 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-Name:           python3-Pygments
+%define modname Pygments
+Name:           python3-%{modname}
 Version:        1.5
 Release:        0
 Url:            http://pygments.org
 Summary:        Pygments is a syntax highlighting package written in Python
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
-Source:         http://pypi.python.org/packages/source/P/Pygments/Pygments-%{version}.tar.gz
+Source:         http://pypi.python.org/packages/source/P/%{modname}/%{modname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python3
 BuildRequires:  python3-devel
 BuildRequires:  python3-2to3
 BuildRequires:  python3-distribute
 BuildRequires:  python3-nose
-%if 0%{?suse_version} && 0%{?suse_version} <= 1140
+%if 0%{?suse_version} <= 1140
 %{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)}
 %ifarch x86_64
@@ -59,13 +59,19 @@ source code. Highlights are:
  * ... and it highlights even Brainfuck!
 
 %prep
-%setup -q -n Pygments-%{version}
+%setup -q -n %{modname}-%{version}
+# remove non-oss licensed files, see bnc# 760344
+rm tests/examplefiles/Sorting.mod
+rm tests/examplefiles/test.mod
+rm tests/examplefiles/output/Sorting.mod
+rm tests/examplefiles/output/test.mod
 
 %build
 python3 setup.py build
 
 %install
 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
+# rename binary file and man file to avoid conflicts with the python 2 version
 install -Dm0644 docs/pygmentize.1 %{buildroot}%{_mandir}/man1/pygmentize-python%{py3_ver}.1
 mv %{buildroot}%{_bindir}/pygmentize %{buildroot}%{_bindir}/pygmentize-python%{py3_ver}
 
@@ -73,7 +79,8 @@ mv %{buildroot}%{_bindir}/pygmentize %{buildroot}%{_bindir}/pygmentize-python%{p
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGES TODO docs/build
 %{_bindir}/pygmentize-python%{py3_ver}
-%{python3_sitelib}/*
 %{_mandir}/man1/pygmentize-python%{py3_ver}.1.gz
+%{python3_sitelib}/pygments/
+%{python3_sitelib}/%{modname}-%{version}-py%{py3_ver}.egg-info/
 
 %changelog