diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1449591be8..553620efc1 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-24  Joost Verburg  <joostverburg@users.sf.net>
+
+	* configure.py: add support for the EMF file format and the
+	metafile2eps conversion utility for WMF/EMF to EPS conversion
+
 2007-07-24  José Matos  <jamatos@lyx.org>
 
 	* unicodesymbols: new file to read documents from 1.5.x
diff --git a/lib/configure.py b/lib/configure.py
index 5ee827c275..77e0320621 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -313,7 +313,8 @@ def checkFormatEntries(dtl_tools):
 \Format pstex      pstex_t PSTEX                  "" ""	""	""
 \Format rtf        rtf    "Rich Text Format"      "" ""	""	"vector"
 \Format sxw        sxw    "OpenOffice.Org Writer" O  ""	""	"vector"
-\Format wmf        wmf    "Windows Meta File"     "" ""	""	"vector"
+\Format wmf        wmf    "Windows Metafile"      "" ""	""	"vector"
+\Format emf        emf    "Enhanced Metafile"     "" ""	""	"vector"
 \Format word       doc    "MS Word"               W  ""	""	"vector"
 \Format wordhtml   html   "MS Word (HTML)"        "" ""        ""	""
 ''')
@@ -397,8 +398,11 @@ def checkConverterEntries():
 \converter tgif       pdf        "tgif -stdout -print -color -pdf $$i > $$o"	""''',
             ''])
     #
-    checkProg('a WMF -> EPS converter', ['wmf2eps -o $$o $$i'],
-        rc_entry = [ r'\converter wmf        eps        "%%"	""', ''])
+    checkProg('a WMF -> EPS converter', ['metafile2eps $$i $$o', 'wmf2eps -o $$o $$i'],
+        rc_entry = [ r'\converter wmf        eps        "%%"	""'])
+    #
+    checkProg('an EMF -> EPS converter', ['metafile2eps $$i $$o', 'wmf2eps -o $$o $$i'],
+        rc_entry = [ r'\converter emf        eps        "%%"	""'])
     #
     checkProg('a EPS -> PDF converter', ['epstopdf'],
         rc_entry = [ r'\converter eps        pdf        "epstopdf --outfile=$$o $$i"	""', ''])