diff --git a/ipython.spec b/ipython.spec
index 80f8c0f..7c7259a 100644
--- a/ipython.spec
+++ b/ipython.spec
@@ -6,7 +6,7 @@
 
 # where are all the python3 dependencies
 %if 0%{?fedora} > 15
-%global with_python3 0
+%global with_python3 1
 %endif
 
 # where are all the pypy dependencies
@@ -16,7 +16,7 @@
 
 Name:           ipython
 Version:        0.13.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
@@ -42,6 +42,7 @@ BuildRequires:  python-zmq
 BuildRequires:  python-zmq-tests
 BuildRequires:  pexpect
 BuildRequires:  python-matplotlib
+BuildRequires:  python-matplotlib-tk
 BuildRequires:  pymongo
 BuildRequires:  PyQt4
 # for frontend
@@ -62,12 +63,13 @@ BuildRequires:  python3-simplegeneric
 BuildRequires:  python3-zmq
 BuildRequires:  python3-zmq-tests
 BuildRequires:  python3-tornado
-#BuildRequires:  python3-pexpect
-#BuildRequires:  python3-matplotlib
-#BuildRequires:  python3-pymongo
+BuildRequires:  python3-pexpect
+BuildRequires:  python3-matplotlib
+BuildRequires:  python3-matplotlib-tk
+BuildRequires:  python3-pymongo
 BuildRequires:  python3-PyQt4
 # for frontend
-#BuildRequires:  python3-pygments
+BuildRequires:  python3-pygments
 
 Requires:       python3-zmq
 %endif
@@ -227,6 +229,16 @@ rm pexpect/_pexpect.py
 
 popd
 
+exclude="exclusions.extend(["
+# Exclude tests that depend on a running X server.
+exclude+="ipjoin('lib', 'tests', 'test_irunner_pylab_magic'),"
+exclude+="ipjoin('frontend', 'qt', 'console', 'tests', 'test_console_widget'),"
+exclude+="ipjoin('frontend', 'qt', 'console', 'tests', 'test_kill_ring'),"
+# Exclude a hanging test: https://github.com/ipython/ipython/issues/2650
+exclude+="ipjoin('zmq', 'tests', 'test_embed_kernel'),"
+exclude+="])"
+sed -ie "/return exclusions/i \ \ \ \ $exclude" IPython/testing/iptest.py
+
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -270,6 +282,9 @@ rm -rf %{buildroot}
 
 %if %{with run_testsuite}
 %check
+# Ensure that the user's .pythonrc.py is not invoked during any tests.
+export PYTHONSTARTUP=""
+
 %if 0%{?with_python3}
 pushd %{py3dir}
 PYTHONPATH=%{buildroot}%{python3_sitelib} \
@@ -410,8 +425,6 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \
 %exclude %{python3_sitelib}/IPython/*/tests/
 %exclude %{python3_sitelib}/IPython/*/*/tests
 
-%{python3_sitelib}/IPython/.git_commit_info.ini
-
 
 %files -n python3-ipython-tests
 %defattr(-,root,root,-)
@@ -428,12 +441,14 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \
 
 %files -n python3-ipython-gui
 %defattr(-,root,root,-)
-%{_bindir}/ipython3-qtconsole
 %{python3_sitelib}/IPython/zmq/gui
 %{python3_sitelib}/IPython/frontend/qt/
 %endif # with_python3
 
 %changelog
+* Wed Dec  5 2012 Andrew McNabb <amcnabb@mcnabbs.org> - 0.13.1-2
+- Build for Python 3
+
 * Wed Oct 24 2012 Thomas Spura <tomspur@fedoraproject.org> - 0.13.1-1
 - update to 0.13.1 (#838031)
 - run tests with en_US.UTF-8