diff --git a/.cvsignore b/.cvsignore
index 9094dc5..0427ccc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-antlr-3.0.1.tar.gz
+antlr-3.1.1.tar.gz
diff --git a/antlr3.spec b/antlr3.spec
index 65e92b8..5011fbd 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -1,9 +1,11 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Summary: ANother Tool for Language Recognition
 Name: antlr3
-Version: 3.0.1
-Release: 2%{?dist}
+Version: 3.1.1
+Release: 1%{?dist}
 URL: http://www.antlr.org/
-Source0: http://www.antlr.org/download/antlr-3.0.1.tar.gz
+Source0: http://www.antlr.org/download/antlr-3.1.1.tar.gz
 # Utility file, in conversation with upstream about this
 Source1: antlr-clean-generated
 License: BSD
@@ -23,6 +25,16 @@ that provides a framework for constructing recognizers,
 interpreters, compilers, and translators from grammatical 
 descriptions containing actions in a variety of target languages.
 
+%package        python
+Group:          Development/Libraries
+Summary:        Python runtime support for ANTLR-generated parsers
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools-devel
+BuildArch:      noarch
+
+%description    python
+Python runtime support for ANTLR-generated parsers
+
 %prep
 %setup -q -n antlr-%{version}
 
@@ -30,13 +42,22 @@ descriptions containing actions in a variety of target languages.
 rm -f lib/*.jar
 build-jar-repository -s -p lib stringtemplate
 # Clean out generated files upstream includes
-python %{SOURCE1} .
+%{__python} %{SOURCE1} .
 # Build
 ant
 
+# Build the python runtime
+cd runtime/Python
+%{__python} setup.py build
+cd ../..
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D build/antlr.jar $RPM_BUILD_ROOT%{_datadir}/java/antlr3.jar
+install -D build/antlr-%{version}.jar $RPM_BUILD_ROOT%{_datadir}/java/antlr3.jar
+
+cd runtime/Python
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+cd ../..
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -46,7 +67,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.txt LICENSE.txt
 %{_datadir}/java/*.jar
 
+%files python
+%defattr(0644,root,root,0755)
+%{python_sitelib}/antlr3/*
+%{python_sitelib}/antlr_python_runtime-*
+
 %changelog
+* Mon Nov  3 2008 Bart Vanbrabant <bart.vanbrabant@zoeloelip.be> - 3.1.1-1
+- Update to version 3.1.1
+- Add python runtime subpackage
+
 * Fri Jun 27 2008 Colin Walters <walters@redhat.com> - 3.0.1-2
 - Fix some BRs
 
diff --git a/sources b/sources
index 0a0d063..b1de651 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3368332e3ecec632db667cb5cdfdbf6f  antlr-3.0.1.tar.gz
+c9fb696a18126a4d633aedcd96d9822a  antlr-3.1.1.tar.gz