diff --git a/python-reportlab.spec b/python-reportlab.spec
index fdf5240..3956991 100644
--- a/python-reportlab.spec
+++ b/python-reportlab.spec
@@ -2,17 +2,19 @@
 
 Name:		python-reportlab
 Version:	2.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Python PDF generation library
 
 Group:		Development/Libraries
 License:	BSD
 URL:		http://www.reportlab.org/
 Source0:	http://www.reportlab.org/ftp/ReportLab_2_3.tar.gz
+Patch0:     reportlab-2.3-font-locations.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: python-devel, python-imaging
+BuildRequires: python-devel, python-imaging, freetype-devel
+Requires:   dejavu-sans-fonts
 
 
 %description
@@ -31,6 +33,7 @@ Contains the documentation for ReportLab.
 
 %prep
 %setup -q -n ReportLab_2_3
+%patch0 -p1 -b .fonts
 # clean up hashbangs from libraries
 find src -name '*.py' | xargs sed -i -e '/^#!\//d'
 
@@ -45,6 +48,8 @@ PYTHONPATH="`pwd`/`ls -d build/lib*`" %{__python} docs/genAll.py
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+# Remove bundled fonts
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/reportlab/fonts
 
 
 %clean
@@ -65,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 23 2009 Konstantin Ryabitsev <icon@fedoraproject.org> - 2.3-2
+- Do not bundle fonts
+- Point the config to Fedora's font locations
+
 * Thu Nov 12 2009 Konstantin Ryabitsev <icon@fedoraproject.org> - 2.3-1
 - Updated to 2.3
 - New version is no longer noarch.
diff --git a/reportlab-2.3-font-locations.patch b/reportlab-2.3-font-locations.patch
new file mode 100644
index 0000000..d819492
--- /dev/null
+++ b/reportlab-2.3-font-locations.patch
@@ -0,0 +1,76 @@
+--- ReportLab_2_3.orig/src/reportlab/rl_config.py	2008-12-12 12:55:22.000000000 -0500
++++ ReportLab_2_3/src/reportlab/rl_config.py	2009-11-23 16:14:45.839728088 -0500
+@@ -41,25 +41,7 @@
+ 
+ # places to look for T1Font information
+ T1SearchPath =  (
+-                'c:/Program Files/Adobe/Acrobat 9.0/Resource/Font', 
+-                'c:/Program Files/Adobe/Acrobat 8.0/Resource/Font', 
+-                'c:/Program Files/Adobe/Acrobat 7.0/Resource/Font', 
+-                'c:/Program Files/Adobe/Acrobat 6.0/Resource/Font', #Win32, Acrobat 6
+-                'c:/Program Files/Adobe/Acrobat 5.0/Resource/Font',     #Win32, Acrobat 5
+-                'c:/Program Files/Adobe/Acrobat 4.0/Resource/Font', #Win32, Acrobat 4
+-                '%(disk)s/Applications/Python %(sys_version)s/reportlab/fonts', #Mac?
+-                '/usr/lib/Acrobat9/Resource/Font',      #Linux, Acrobat 5?
+-                '/usr/lib/Acrobat8/Resource/Font',      #Linux, Acrobat 5?
+-                '/usr/lib/Acrobat7/Resource/Font',      #Linux, Acrobat 5?
+-                '/usr/lib/Acrobat6/Resource/Font',      #Linux, Acrobat 5?
+-                '/usr/lib/Acrobat5/Resource/Font',      #Linux, Acrobat 5?
+-                '/usr/lib/Acrobat4/Resource/Font',      #Linux, Acrobat 4
+-                '/usr/local/Acrobat9/Resource/Font',    #Linux, Acrobat 5?
+-                '/usr/local/Acrobat8/Resource/Font',    #Linux, Acrobat 5?
+-                '/usr/local/Acrobat7/Resource/Font',    #Linux, Acrobat 5?
+-                '/usr/local/Acrobat6/Resource/Font',    #Linux, Acrobat 5?
+-                '/usr/local/Acrobat5/Resource/Font',    #Linux, Acrobat 5?
+-                '/usr/local/Acrobat4/Resource/Font',    #Linux, Acrobat 4
++                '/usr/share/fonts/default/Type1',
+                 '%(REPORTLAB_DIR)s/fonts',              #special
+                 '%(REPORTLAB_DIR)s/../fonts',           #special
+                 '%(REPORTLAB_DIR)s/../../fonts',        #special
+@@ -68,43 +50,17 @@
+ 
+ # places to look for TT Font information
+ TTFSearchPath = (
+-                'c:/winnt/fonts',
+-                'c:/windows/fonts',
+-                '/usr/lib/X11/fonts/TrueType/',
++                '/usr/share/fonts/dejavu',
++                '/usr/share/fonts',
+                 '%(REPORTLAB_DIR)s/fonts',      #special
+                 '%(REPORTLAB_DIR)s/../fonts',   #special
+                 '%(REPORTLAB_DIR)s/../../fonts',#special
+                 '%(HOME)s/fonts',               #special
+-                #mac os X - from
+-                #http://developer.apple.com/technotes/tn/tn2024.html
+-                '~/Library/Fonts',
+-                '/Library/Fonts',
+-                '/Network/Library/Fonts',
+-                '/System/Library/Fonts',
+-                
+                 )
+ 
+ # places to look for CMap files - should ideally merge with above
+ CMapSearchPath = (
+-                  '/usr/lib/Acrobat9/Resource/CMap',
+-                  '/usr/lib/Acrobat8/Resource/CMap',
+-                  '/usr/lib/Acrobat7/Resource/CMap',
+-                  '/usr/lib/Acrobat6/Resource/CMap',
+-                  '/usr/lib/Acrobat5/Resource/CMap',
+-                  '/usr/lib/Acrobat4/Resource/CMap',
+-                  '/usr/local/Acrobat9/Resource/CMap',
+-                  '/usr/local/Acrobat8/Resource/CMap',
+-                  '/usr/local/Acrobat7/Resource/CMap',
+-                  '/usr/local/Acrobat6/Resource/CMap',
+-                  '/usr/local/Acrobat5/Resource/CMap',
+-                  '/usr/local/Acrobat4/Resource/CMap',
+-                  'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap',
+-                  'C:\\Program Files\\Adobe\\Acrobat 9.0\\Resource\\CMap',
+-                  'C:\\Program Files\\Adobe\\Acrobat 8.0\\Resource\\CMap',
+-                  'C:\\Program Files\\Adobe\\Acrobat 7.0\\Resource\\CMap',
+-                  'C:\\Program Files\\Adobe\\Acrobat 6.0\\Resource\\CMap',
+-                  'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap',
+-                  'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap',
++                  '/usr/share/ghostscript/8.70/Resource/CMap',
+                   '%(REPORTLAB_DIR)s/fonts/CMap',       #special
+                   '%(REPORTLAB_DIR)s/../fonts/CMap',    #special
+                   '%(REPORTLAB_DIR)s/../../fonts/CMap', #special