diff --git a/evince-t1font-mapping.patch b/evince-t1font-mapping.patch
new file mode 100644
index 0000000..e701446
--- /dev/null
+++ b/evince-t1font-mapping.patch
@@ -0,0 +1,11 @@
+--- evince-2.29.91/backend/dvi/mdvi-lib/t1.c	2009-04-24 09:24:16.000000000 +0200
++++ evince-2.29.91/backend/dvi/mdvi-lib/t1.c	2010-03-09 15:37:26.000000000 +0100
+@@ -143,7 +143,7 @@ char	*t1_lookup_font(const char *name, U
+ 
+ 	/* get the `base' name */
+ 	if(ext) {
+-		newname = mdvi_strdup(name);
++		newname = mdvi_strdup(info.fontfile);
+ 		newname[ext - info.fontfile - 1] = 0;
+ 	} else
+ 		newname = (char *)name; /* we don't modify this */
diff --git a/evince.spec b/evince.spec
index 9aecc55..11115f1 100644
--- a/evince.spec
+++ b/evince.spec
@@ -6,7 +6,7 @@
 
 Name:		evince
 Version:	2.29.91
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Document viewer
 
 License:	GPLv2+ and GFDL
@@ -15,6 +15,8 @@ URL:		http://projects.gnome.org/evince/
 Source0:	http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=455759
 # Patch1:		duplex-copies.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=562648
+Patch2:		evince-t1font-mapping.patch
 
 BuildRequires:	gtk2-devel >= %{gtk2_version}
 BuildRequires:	glib2-devel >= %{glib2_version}
@@ -36,6 +38,7 @@ BuildRequires:	libtool
 BuildRequires:	gtk-doc
 BuildRequires:	intltool
 BuildRequires:	GConf2-devel
+BuildRequires:	t1lib-devel
 
 # for the dvi backend
 BuildRequires: kpathsea-devel
@@ -102,13 +105,15 @@ This package contains a backend to let evince display djvu files.
 %prep
 %setup -q
 # %patch1 -p0 -b .duplex-copies
+%patch2 -p1 -b .t1font-map
 
 %build
 %configure --disable-static --disable-scrollkeeper \
 	--with-print=gtk \
 	--enable-comics=yes \
 	--enable-dvi=yes \
-	--enable-djvu=yes
+	--enable-djvu=yes \
+	--enable-t1lib=yes
 make %{?_smp_mflags}
 
 %install
@@ -259,6 +264,11 @@ fi
 %{_libdir}/evince/2/backends/djvudocument.evince-backend
 
 %changelog
+* Tue Mar  9 2010 Marek Kasik <mkasik@redhat.com> - 2.29.91-2
+- Use Type 1 fonts when viewing DVI files
+- Use correct name when the font is mapped
+- Related: #562648
+
 * Mon Feb 22 2010 Matthias Clasen <mclasen@redhat.com> - 2.29.91-1
 - Update to 2.29.91