diff --git a/development/FORMAT b/development/FORMAT
index 9eb9839554..a460b24474 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,12 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx.
 
 -----------------------
 
+2012-12-04 Jürgen Spitzmüller <spitz@lyx.org>
+	* Format incremented to 450: Support for the URW Garamond LaTeX fonts.
+	  - \usepackage{garamondx} > \font_serif garamondx
+	     - [osf], [osfI] > \font_osf true
+	  Also (fallback): 
+	  - \renewcommand{\sffamily}{ugm} > \font_serif garamondx
 
 2012-11-29 Jürgen Spitzmüller <spitz@lyx.org>
 	* Format incremented to 449: Support for \item arguments.
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 6117839fc5..f198ae14c2 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -399,6 +399,8 @@
 \TestPackage{eulervm}
 \TestPackage{feyn}
 \TestPackage{fourier}
+\TestPackage{garamondx}
+\TestFont[zgmr8r]{garamondx-fonts}
 \TestPackage{libertine}
 \TestPackage{libertine-type1}
 \TestPackage{lmodern}
@@ -418,6 +420,7 @@
 \TestPackage{tgpagella}
 \TestPackage{tgschola}
 \TestPackage{tgtermes}
+\TestFont[ugmr8r]{ugm}
 \TestFont[uopr8a]{urwclassico}
 \TestPackage{tipa}
 \TestPackage{tipx}
diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index cbe1652fe6..12717e2719 100644
--- a/lib/doc/LaTeXConfig.lyx
+++ b/lib/doc/LaTeXConfig.lyx
@@ -1,5 +1,5 @@
 #LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 445
+\lyxformat 450
 \begin_document
 \begin_header
 \textclass article
@@ -825,7 +825,7 @@ mathdesign
 \begin_layout Itemize
 
 \family sans
-Adobe Garamond (Mathdesign)
+URW Garamond (Mathdesign)
 \family default
 .
  
@@ -1836,6 +1836,60 @@ Notes: URW Classico is a clone of the Optima typeface, a very well-known
  utility.
 \end_layout
 
+\begin_layout Subsection
+URW Garamond
+\end_layout
+
+\begin_layout Description
+Found: 
+\begin_inset Info
+type  "package"
+arg   "garamondx"
+\end_inset
+
+
+\end_layout
+
+\begin_layout Description
+CTAN: 
+\family sans
+/fonts/garamondx/
+\end_layout
+
+\begin_layout Description
+Notes: The 
+\family sans
+garamondx
+\family default
+ package provides access to the URW Garamond fonts.
+ These fonts are available for non-commercial use under the Aladdin Free
+ Public License.
+ Under TeX Live the fonts needs to be installed, separately from the package
+ itself, via the 'getnonfreefonts-sys' utility (installed: 
+\begin_inset Info
+type  "package"
+arg   "garamondx-fonts"
+\end_inset
+
+).
+ The 
+\family sans
+garamondx
+\family default
+ package provides old style figures.
+ As a fallback, the package 
+\family sans
+ugm
+\family default
+ (installed: 
+\begin_inset Info
+type  "package"
+arg   "ugm"
+\end_inset
+
+) is used, which however does not include old style figures.
+\end_layout
+
 \begin_layout Section
 Standard LaTeX document classes
 \end_layout
diff --git a/lib/latexfonts b/lib/latexfonts
index 9f86ed6f10..da320106a0 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -130,6 +130,21 @@ AltFont eco
 	Package          eco
 EndFont
 
+Font garamondx
+	GuiName          "URW Garamond"
+	Family           rm
+	OsfOption        osfI
+	Package          garamondx
+	Requires         garamondx-fonts
+	AltFonts         ugm
+EndFont
+
+AltFont ugm
+	GuiName          "URW Garamond"
+	Family           rm
+	SwitchDefault    1
+EndFont
+
 Font libertine
 	GuiName          "Libertine"
 	Family           rm
@@ -201,7 +216,7 @@ AltFont mdput
 EndFont
 
 Font md-garamond
-	GuiName          "Adobe Garamond (Mathdesign)"
+	GuiName          "URW Garamond (Mathdesign)"
 	Family           rm
 	OsfOption        expert
 	ScOption         expert
@@ -214,7 +229,7 @@ Font md-garamond
 EndFont
 
 AltFont mdugm
-	GuiName          "Adobe Garamond (Mathdesign)"
+	GuiName          "URW Garamond (Mathdesign)"
 	Family           rm
 	SwitchDefault    1
 	Requires         mdugm
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index c95fec46fa..3fe14a5dc9 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -1795,6 +1795,24 @@ def revert_itemargs(document):
         i = i + 1
 
 
+def revert_garamondx(document):
+    " Revert native garamond font definition to LaTeX " 
+
+    if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1: 
+        i = find_token(document.header, "\\font_roman garamondx", 0)
+        if i != -1:
+            osf = False
+            j = find_token(document.header, "\\font_osf true", 0)
+            if j != -1:
+                osf = True
+            preamble = "\\usepackage"
+            if osf:
+                preamble += "[osfI]"
+            preamble += "{garamondx}"
+            add_to_preamble(document, [preamble])
+            document.header[i] = "\\font_roman default"
+
+
 ##
 # Conversion hub
 #
@@ -1836,10 +1854,12 @@ convert = [
            [446, [convert_latexargs]],
            [447, [convert_IEEEtran, convert_AASTeX, convert_AGUTeX, convert_IJMP, convert_SIGPLAN, convert_SIGGRAPH, convert_EuropeCV]],
            [448, [convert_literate]],
-           [449, []]
+           [449, []],
+           [450, []]
           ]
 
 revert =  [
+           [449, [revert_garamondx]],
            [448, [revert_itemargs]],
            [447, [revert_literate]],
            [446, [revert_IEEEtran, revert_AASTeX, revert_AGUTeX, revert_IJMP, revert_SIGPLAN, revert_SIGGRAPH, revert_EuropeCV]],
diff --git a/src/version.h b/src/version.h
index 44a46bfd01..6577acf87a 100644
--- a/src/version.h
+++ b/src/version.h
@@ -30,8 +30,8 @@ extern char const * const lyx_version_info;
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 449 // spitz: support for \item arguments
-#define LYX_FORMAT_TEX2LYX 449 // spitz: support for \item arguments
+#define LYX_FORMAT_LYX 450 // spitz: support for URW Garamond
+#define LYX_FORMAT_TEX2LYX 450 // spitz: support for URW Garamond
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER