diff --git a/.gitignore b/.gitignore
index e14641b..f04f2a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 rdflib-2.4.2.tar.gz
+/rdflib-3.1.0.tar.gz
diff --git a/filter-provides.sh b/filter-provides.sh
deleted file mode 100755
index 7df79df..0000000
--- a/filter-provides.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# See http://fedoraproject.org/wiki/PackagingDrafts/FilteringAutomaticDependencies
-if [ -x /usr/lib/rpm/redhat/find-provides ] ; then
-FINDPROV=/usr/lib/rpm/redhat/find-provides
-else
-FINDPROV=/usr/lib/rpm/find-provides
-fi
-
-$FINDPROV $* | sed -e '/SPARQLParserc.so/d'
diff --git a/python-rdflib.spec b/python-rdflib.spec
index ab5f047..eb795ec 100644
--- a/python-rdflib.spec
+++ b/python-rdflib.spec
@@ -1,25 +1,18 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 # The upstream test suite does not pass on recent versions of Fedora
 # See package review (bug 378841)
 # For now, we disable running the test suite:
 %define run_tests 0
 
 Name:           python-rdflib
-Version:        2.4.2
-Release:        3%{?dist}
+Version:        3.1.0
+Release:        1%{?dist}
 Summary:        Python library for working with RDF
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://rdflib.net
-Source0:        http://rdflib.net/rdflib-%{version}.tar.gz
-
-# Filter out unwanted autogenerated Provides: SPARQLParserc.so
-# See http://fedoraproject.org/wiki/PackagingDrafts/FilteringAutomaticDependencies
-Source1:        filter-provides.sh
-%define _use_internal_dependency_generator 0
-%define __find_provides %{SOURCE1}
+Source0:        http://rdflib.googlecode.com/files/rdflib-%{version}.tar.gz
+BuildArch:      noarch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -45,46 +38,30 @@ memory, MySQL, Redland, SQLite, Sleepycat, ZODB and SQLObject.
 
 %prep
 %setup -q -n rdflib-%{version}
-chmod +x %{SOURCE1}
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-cp LICENSE $RPM_BUILD_ROOT/%{python_sitearch}/rdflib/LICENSE
-rm -rf $RPM_BUILD_ROOT/%{python_sitearch}/test
+cp LICENSE $RPM_BUILD_ROOT/%{python_sitelib}/rdflib/LICENSE
 
 # Various .py files within site-packages have a shebang line but aren't
 # flagged as executable.
 # I've gone through them and either removed the shebang or made them
 # executable as appropriate:
-#   rdflib_tools/RDFPipe.py: __main__ parses RDF from stdin
-chmod +x $RPM_BUILD_ROOT/%{python_sitearch}/rdflib_tools/RDFPipe.py
-
-#   sparql/parser.py: __main__ runs self-tests:
-chmod +x $RPM_BUILD_ROOT/%{python_sitearch}/rdflib/sparql/parser.py
 
-#   syntax/parsers/n3meta.py doesn't have a meaningful __main__; drop
-#   the shebang:
-%{__sed} -i "s|#!/usr/bin/env python||" $RPM_BUILD_ROOT/%{python_sitearch}/rdflib/syntax/parsers/n3p/n3meta.py
+# __main__ parses URI as N-Triples:
+chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/rdflib/plugins/parsers/ntriples.py
 
-#   syntax/parsers/ntriples.py: __main__ parses NTriples from a URI:
-chmod +x $RPM_BUILD_ROOT/%{python_sitearch}/rdflib/syntax/parsers/ntriples.py
+# __main__ parses the file given on the command line:
+chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/rdflib/plugins/parsers/notation3.py
 
-#   syntax/parsers/n3p/n3p.py:  __main__ parses N3 from a file
-chmod +x $RPM_BUILD_ROOT/%{python_sitearch}/rdflib/syntax/parsers/n3p/n3p.py
-
-#   syntax/parsers/n3p/uripath.py: __main__ runs unit tests:
-chmod +x $RPM_BUILD_ROOT/%{python_sitearch}/rdflib/syntax/parsers/n3p/uripath.py
-
-#   syntax/parsers/n3p/n3proc.py: __main__ parses from a URI:
-chmod +x $RPM_BUILD_ROOT/%{python_sitearch}/rdflib/syntax/parsers/n3p/n3proc.py
 
 %check
 %if %{run_tests}
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py test
+%{__python} run_tests.py
 %endif
 
 %clean
@@ -93,10 +70,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
-%{python_sitearch}/*
-%{_bindir}/rdfpipe
+%{python_sitelib}/*
 
 %changelog
+* Wed Sep 28 2011 David Malcolm <dmalcolm@redhat.com> - 3.1.0-1
+- 3.1.0; converting from arch-specific to noarch (sitearch -> sitelib);
+removing rdfpipe and various other extensions
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index e428084..713e011 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-921390cacfebf97384bd5ac33c38d327  rdflib-2.4.2.tar.gz
+415c3b28ab0c6010b02c1523e8fa5b28  rdflib-3.1.0.tar.gz