diff --git a/openerp/addons/base/res/__init__.py b/openerp/addons/base/res/__init__.py
index 50807e20116..041a42f9f14 100644
--- a/openerp/addons/base/res/__init__.py
+++ b/openerp/addons/base/res/__init__.py
@@ -29,6 +29,7 @@ import res_company
 import res_users
 import res_request
 import res_lang
+import res_font
 import ir_property
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index d61963dbce4..e922cfbbe1e 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -112,9 +112,6 @@ class res_company(osv.osv):
         
     def _get_companies_from_partner(self, cr, uid, ids, context=None):
         return self.pool['res.company'].search(cr, uid, [('partner_id', 'in', ids)], context=context)
-    
-    def _get_font(self, cr, uid, context=None):
-        return sorted(customfonts.RegisterCustomFonts())
 
     _columns = {
         'name': fields.related('partner_id', 'name', string='Company Name', size=128, required=True, store=True, type='char'),
@@ -128,7 +125,7 @@ class res_company(osv.osv):
         'rml_footer': fields.text('Report Footer', help="Footer text displayed at the bottom of all reports."),
         'rml_footer_readonly': fields.related('rml_footer', type='text', string='Report Footer', readonly=True),
         'custom_footer': fields.boolean('Custom Footer', help="Check this to define the report footer manually.  Otherwise it will be filled in automatically."),
-        'font': fields.selection(_get_font, "Font",help="Set the font into the report header, will be used for every RML report of the company"),
+        'font': fields.many2one('res.font', string="Font",help="Set the font into the report header, will be used for every RML report of the company"),
         'logo': fields.related('partner_id', 'image', string="Logo", type="binary"),
         'logo_web': fields.function(_get_logo_web, string="Logo Web", type="binary", store={
             'res.company': (lambda s, c, u, i, x: i, ['partner_id'], 10),
@@ -192,10 +189,11 @@ class res_company(osv.osv):
             
             default_para = re.sub('fontName.?=.?".*"', 'fontName="%s"'% font,header)
             return re.sub('(<setFont.?name.?=.?)(".*?")(.)', '\g<1>"%s"\g<3>'% font,default_para)
+        fontname = self.pool.get('res.font').browse(cr, uid, font, context=context).name
         return {'value':{
-                        'rml_header': _change_header(rml_header,font),
-                        'rml_header2':_change_header(rml_header2,font),
-                        'rml_header3':_change_header(rml_header3,font)
+                        'rml_header': _change_header(rml_header,fontname),
+                        'rml_header2':_change_header(rml_header2,fontname),
+                        'rml_header3':_change_header(rml_header3,fontname)
                         }}
 
     def on_change_country(self, cr, uid, ids, country_id, context=None):
@@ -388,6 +386,9 @@ class res_company(osv.osv):
             return {'value': {'rml_header': self._header_letter}}
         return {'value': {'rml_header': self._header_a4}}
 
+    def act_discover_fonts(self, cr, uid, ids, context=None):
+        return self.pool.get("res.font").act_discover_fonts(cr, uid, ids, context)
+
     _defaults = {
         'currency_id': _get_euro,
         'paper_format': 'a4',
@@ -395,12 +396,10 @@ class res_company(osv.osv):
         'rml_header2': _header2,
         'rml_header3': _header3,
         'logo':_get_logo,
-        'font':'Helvetica',
     }
 
     _constraints = [
         (osv.osv._check_recursion, 'Error! You can not create recursive companies.', ['parent_id'])
     ]
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index e9acf7940b3..ebf6cb534b3 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -81,6 +81,7 @@
                                 <field name="rml_footer" attrs="{'invisible': [('custom_footer','=',False)]}"/>
                                 <field name="rml_footer_readonly" attrs="{'invisible': [('custom_footer','=',True)]}"/>
                                 <field name="font" on_change="onchange_font_name(font, rml_header, rml_header2, rml_header3)"/>
+                                <button string="Reload fonts" name="act_discover_fonts" type="object" class="oe_link"/>
                             </group>
                         </page>
                         <page string="Header/Footer" groups="base.group_no_one">
diff --git a/openerp/addons/base/res/res_font.py b/openerp/addons/base/res/res_font.py
new file mode 100644
index 00000000000..e67939c541d
--- /dev/null
+++ b/openerp/addons/base/res/res_font.py
@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from reportlab import rl_config
+from reportlab.pdfbase import pdfmetrics, ttfonts
+from openerp.osv import fields, osv
+
+import logging
+import os,platform
+
+"""This module allows the mapping of some system-available TTF fonts to
+the reportlab engine.
+
+This file could be customized per distro (although most Linux/Unix ones)
+should have the same filenames, only need the code below).
+
+Due to an awful configuration that ships with reportlab at many Linux
+and Ubuntu distros, we have to override the search path, too.
+"""
+_fonts_cache = {'registered_fonts': [], 'total_system_fonts': 0}
+_logger = logging.getLogger(__name__)
+
+# Basic fonts family included in PDF standart, will always be in the font list
+BasePDFFonts = [
+    'Helvetica',
+    'Times',
+    'Courier'
+]
+
+# List of fonts found on the disk
+CustomTTFonts = BaseCustomTTFonts = [ ('Helvetica', "DejaVu Sans", "DejaVuSans.ttf", 'normal'),
+        ('Helvetica', "DejaVu Sans Bold", "DejaVuSans-Bold.ttf", 'bold'),
+        ('Helvetica', "DejaVu Sans Oblique", "DejaVuSans-Oblique.ttf", 'italic'),
+        ('Helvetica', "DejaVu Sans BoldOblique", "DejaVuSans-BoldOblique.ttf", 'bolditalic'),
+        ('Times', "Liberation Serif", "LiberationSerif-Regular.ttf", 'normal'),
+        ('Times', "Liberation Serif Bold", "LiberationSerif-Bold.ttf", 'bold'),
+        ('Times', "Liberation Serif Italic", "LiberationSerif-Italic.ttf", 'italic'),
+        ('Times', "Liberation Serif BoldItalic", "LiberationSerif-BoldItalic.ttf", 'bolditalic'),
+        ('Courier', "FreeMono", "FreeMono.ttf", 'normal'),
+        ('Courier', "FreeMono Bold", "FreeMonoBold.ttf", 'bold'),
+        ('Courier', "FreeMono Oblique", "FreeMonoOblique.ttf", 'italic'),
+        ('Courier', "FreeMono BoldOblique", "FreeMonoBoldOblique.ttf", 'bolditalic'),
+]
+
+
+# Search path for TTF files, in addition of rl_config.TTFSearchPath
+TTFSearchPath = [
+            '~/test',
+            '/usr/share/fonts/truetype', # SuSE
+            '/usr/share/fonts/dejavu', '/usr/share/fonts/liberation', # Fedora, RHEL
+            '/usr/share/fonts/truetype/*','/usr/local/share/fonts' # Ubuntu,
+            '/usr/share/fonts/TTF/*', # at Mandriva/Mageia
+            '/usr/share/fonts/TTF', # Arch Linux
+            '/usr/lib/openoffice/share/fonts/truetype/',
+            '~/.fonts',
+            '~/.local/share/fonts',
+
+            # mac os X - from
+            # http://developer.apple.com/technotes/tn/tn2024.html
+            '~/Library/Fonts',
+            '/Library/Fonts',
+            '/Network/Library/Fonts',
+            '/System/Library/Fonts',
+
+            # windows
+            'c:/winnt/fonts',
+            'c:/windows/fonts'
+]
+
+def list_all_sysfonts():
+    """
+        This function returns list of font directories of system.
+    """
+    filepath = []
+
+    # Perform the search for font files ourselves, as reportlab's
+    # TTFOpenFile is not very good at it.
+    searchpath = list(set(TTFSearchPath + rl_config.TTFSearchPath))
+    for dirname in searchpath:
+        dirname = os.path.expanduser(dirname)
+        if os.path.exists(dirname):
+            for filename in [x for x in os.listdir(dirname) if x.lower().endswith('.ttf')]:
+                filepath.append(os.path.join(dirname, filename))
+    return filepath
+
+
+class res_font(osv.Model):
+    _name = "res.font"
+    _description = 'Fonts available'
+    _order = 'name'
+
+    _columns = {
+        'name': fields.char("Name", required=True),
+    }
+
+    _sql_constraints = [
+        ('name_font_uniq', 'unique(name)', 'You can not register to fonts with the same name'),
+    ]
+
+    def act_discover_fonts(self, cr, uid, ids, context=None):
+        CustomTTFonts = BaseCustomTTFonts
+
+        found_fonts = {}
+        for font_path in list_all_sysfonts():
+            try:
+                font = ttfonts.TTFontFile(font_path)
+                _logger.debug("Found font %s at %s", font.name, font_path)
+                if not found_fonts.get(font.familyName):
+                    found_fonts[font.familyName] = {'name': font.familyName}
+
+                mode = font.styleName.lower().replace(" ", "")
+
+                CustomTTFonts.append((font.familyName, font.name, font_path, mode))
+            except ttfonts.TTFError:
+                _logger.warning("Could not register Font %s", font_path)
+
+        # add default PDF fonts
+        for family in BasePDFFonts:
+            if not found_fonts.get(family):
+                found_fonts[family] = {'name': family}
+
+
+        # to make sure we always have updated list, delete all and recreate
+        self.unlink(cr, uid, self.search(cr, uid, [], context=context), context=context)
+        for family, vals in found_fonts.items():
+            self.create(cr, uid, vals, context=context)
+