diff --git a/ipython-0.10-pycolor-wrong-filename.patch b/ipython-0.10-pycolor-wrong-filename.patch
index 6418336..c91de65 100644
--- a/ipython-0.10-pycolor-wrong-filename.patch
+++ b/ipython-0.10-pycolor-wrong-filename.patch
@@ -1,7 +1,7 @@
 Modified patch from upstream (PyColorize.py was moved):
-commit 3323d576db9f982be1ef6d66f7b9e0d0d6fef7db
+commit e5effe0eb43d57e3a34a9dd07a0c03e3a178b2f2
 Author: Thomas Spura <tomspur@fedoraproject.org>
-Date:   Tue Aug 31 14:12:37 2010 +0200
+Date:   Tue Nov 2 10:19:58 2010 +0100
 
     pycolor: Wrong filename given -> print error
     
@@ -14,7 +14,7 @@ Date:   Tue Aug 31 14:12:37 2010 +0200
     Signed-off-by: Thomas Spura <tomspur@fedoraproject.org>
 
 diff --git a/IPython/utils/PyColorize.py b/IPython/utils/PyColorize.py
-index 613ae19..1bd9919 100644
+index 613ae19..ddf3f7a 100644
 --- a/IPython/PyColorize.py
 +++ b/IPython/PyColorize.py
 @@ -277,7 +277,11 @@ If no filename is given, or if filename is -, read standard input."""
@@ -25,8 +25,8 @@ index 613ae19..1bd9919 100644
 +        try:
 +            stream = file(fname)
 +        except IOError,msg:
-+            print msg
-+            return
++            print >> sys.stderr, msg
++            sys.exit(1)
  
      parser = Parser()
  
diff --git a/ipython.spec b/ipython.spec
index fede0c1..ef3e8f9 100644
--- a/ipython.spec
+++ b/ipython.spec
@@ -4,7 +4,7 @@
 
 Name:           ipython
 Version:        0.10.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
@@ -18,8 +18,12 @@ Source0:        http://ipython.scipy.org/dist/%{name}-%{version}.tar.gz
 Patch0:         %{name}-itpl-external.patch
 # unbundle all current libraries, a similar patch submitted upstream
 Patch1:         %{name}-unbundle-external-module.patch
-# fix for #628742, published on github for inclusion into upstream
+# fix for #628742, will be in 0.11
 Patch2:         ipython-0.10-pycolor-wrong-filename.patch
+
+# fix for #646079, will be in 0.11
+Patch3:         ipython-0.10-no-gtk.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -36,8 +40,10 @@ Requires:       python-mglob
 Requires:       python-pretty
 Requires:       python-simplegeneric
 
-# will be in python 3.2
+%if ! (0%{?fedora} > 13)
+# argparse is in python 2.7 and 3.2
 Requires:       python-argparse
+%endif
 
 
 
@@ -114,6 +120,7 @@ mv validate.py validate/_validate.py
 popd
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # delete bundling libs
 pushd IPython/external
@@ -229,6 +236,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Nov 15 2010 Thomas Spura <tomspur@fedoraproject.org> - 0.10.1-3
+- add fix for #646079 and use upstream fix for #628742
+
+* Mon Oct 18 2010 Thomas Spura <tomspur@fedoraproject.org> - 0.10.1-2
+- argparse is in python 2.7 and 3.2
+
 * Wed Oct 13 2010 Thomas Spura <tomspur@fedoraproject.org> - 0.10.1-1
 - unbundle a bit differently
 - update to new version