diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 6e6e3d0245..d02c1fb88b 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -124,7 +124,7 @@ const char * const known_old_language_packages[] = {"french", "frenchle",
 char const * const known_fontsizes[] = { "10pt", "11pt", "12pt", 0 };
 
 const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
-"ccfonts", "chancery", "charter", "cmr", "fourier", "lmodern",
+"ccfonts", "chancery", "charter", "cmr", "fourier", "garamondx", "lmodern",
 "mathdesign", "mathpazo", "mathptmx", "newcent", "utopia", 0};
 
 const char * const known_sans_fonts[] = { "avant", "berasans", "cmbr", "cmss",
@@ -669,8 +669,13 @@ void Preamble::handle_package(Parser &p, string const & name,
 			h_font_sc = "true";
 	}
 
+	if (name == "garamondx") {
+		h_font_roman = "garamondx";
+		if (opts == "osfI")
+			h_font_osf = "true";
+	}
+
 	if (name == "mathdesign") {
-		// when font uses real small capitals
 		if (opts.find("charter") != string::npos)
 			h_font_roman = "md-charter";
 		if (opts.find("garamond") != string::npos)
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 4bb98cdfba..a57f6ff894 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -81,7 +81,7 @@ Format LaTeX feature                        LyX feature
 447
 448
 449    \item[<arg>]                         \begin_inset Argument item:<nr>
-450    garamondx.sty, ugm LaTeX font,       \font_roman, \font_osf,
+450    ugm LaTeX font,                      \font_roman, \font_osf,
        [garamondx]{newtxmath}               \font_math
 451    beamer overlay arguments             InsetArgument
        \command<arg>, \begin{env}<arg>