diff --git a/sagemath-ipython3.patch b/sagemath-ipython3.patch
new file mode 100644
index 0000000..a6efe1d
--- /dev/null
+++ b/sagemath-ipython3.patch
@@ -0,0 +1,13 @@
+diff -up src/sage/repl/display/formatter.py.orig src/sage/repl/display/formatter.py
+--- src/sage/repl/display/formatter.py.orig	2015-04-26 11:35:47.474617033 -0300
++++ src/sage/repl/display/formatter.py	2015-04-26 11:36:17.859618196 -0300
+@@ -60,7 +60,8 @@ This other facility uses a simple
+ #*****************************************************************************
+ 
+ 
+-from IPython.core.formatters import PlainTextFormatter, warn_format_error
++from IPython.core.formatters import PlainTextFormatter
++from IPython.core.formatters import catch_format_error as warn_format_error
+ from IPython.utils.py3compat import str_to_unicode, unicode_to_str
+ 
+ from sage.repl.display.pretty_print import (
diff --git a/sagemath.spec b/sagemath.spec
index 1ee8b5b..ecff126 100644
--- a/sagemath.spec
+++ b/sagemath.spec
@@ -42,7 +42,7 @@ Name:		sagemath
 Group:		Applications/Engineering
 Summary:	A free open-source mathematics software system
 Version:	6.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 # The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
 # Additionally, every $files section has a comment with the license name
 # before files with that license
@@ -148,6 +148,9 @@ Patch23:	%{name}-ntl.patch
 # Temporary patch: http://trac.sagemath.org/ticket/17657
 Patch24:	%{name}-parallel.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1194941
+Patch25:	%{name}-ipython3.patch
+
 BuildRequires:	4ti2
 BuildRequires:	atlas-devel
 BuildRequires:	cddlib-tools
@@ -641,6 +644,7 @@ popd
 %patch22
 %patch23
 %patch24
+%patch25
 
 sed -e 's|@@SAGE_ROOT@@|%{SAGE_ROOT}|' \
     -e 's|@@SAGE_DOC@@|%{SAGE_DOC}|' \
@@ -1367,6 +1371,9 @@ exit 0
 
 ########################################################################
 %changelog
+* Sun Apr 26 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 6.5-2
+- Add patch to work with ipython 3
+
 * Fri Apr  3 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 6.5-1
 - Update to sagemath 6.5
 - Add new Catalan and Hungarian doc subpackages