diff --git a/lib/languages b/lib/languages
index 0b272c4b3f..1c07a32ad9 100644
--- a/lib/languages
+++ b/lib/languages
@@ -70,10 +70,7 @@
 #   If True, LyX cares for characters/macros that do not exist in
 #   some font encodings ("<", ">", "|" and straight quote).
 #   It is not required for standard encodings like T2A. See bug #5091.
-# * FontEncoding is the required font encoding for correct hyphenation with
-#   8-bit TeX (http://www.hyphenation.org ).
-#   If not given, all standard text encodings as well as OT1 work.
-#   "FontEncoding none" tells LyX that fontenc should not be loaded with this
+# * "FontEncoding none" tells LyX that fontenc should not be loaded with this
 #   language.
 # * AsBabelOptions advices LyX to pass the languages locally to babel, not
 #   globally to the class. Some languages (basically those not directly
@@ -123,7 +120,6 @@ Language afrikaans
 	BabelName        afrikaans
 	QuoteStyle       polish
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         af_ZA
 End
 
@@ -133,7 +129,6 @@ Language albanian
 	PolyglossiaName  albanian
 	QuoteStyle       swiss
 	Encoding         iso8859-2
-	# FontEncoding   ?? (no hyphenation support?)
 	LangCode         sq_AL
 End
 
@@ -215,7 +210,6 @@ Language asturian
 	LangCode         ast_ES
 End
 
-
 Language australian
 	GuiName          "English (Australia)"
 	BabelName        australian
@@ -235,7 +229,6 @@ Language austrian
 	PolyglossiaOpts  "variant=austrian,spelling=old,babelshorthands=true"
 	QuoteStyle       german
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         de_AT
 End
 
@@ -248,7 +241,6 @@ Language naustrian
 	PolyglossiaOpts  "variant=austrian,spelling=new,babelshorthands=true"
 	QuoteStyle       german
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         de_AT
 End
 
@@ -278,7 +270,6 @@ Language basque
 	PolyglossiaName  basque
 	QuoteStyle       swiss
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         eu_ES
 	PostBabelPreamble
 	\addto\extrasbasque{\bbl@deactivate{~}}
@@ -291,7 +282,6 @@ Language belarusian
 	BabelName        belarusian
 	QuoteStyle       french
 	Encoding         cp1251
-	FontEncoding	 T2A
 	LangCode         be_BY
 	AsBabelOptions   true
 End
@@ -302,7 +292,6 @@ Language bosnian
 	BabelName        bosnian
 	QuoteStyle       polish
 	Encoding         iso8859-2
-	FontEncoding	 T1
 	LangCode         bs_BA
 End
 
@@ -313,7 +302,6 @@ Language brazilian
 	PolyglossiaName  brazil
 	QuoteStyle       english
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         pt_BR
 End
 
@@ -367,7 +355,6 @@ Language canadien
 #	PolyglossiaOpts  "variant=canadien"
 	QuoteStyle       french
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         fr_CA
 End
 
@@ -379,7 +366,6 @@ Language catalan
 	PolyglossiaOpts  "babelshorthands=true"
 	QuoteStyle       french
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         ca_ES
 End
 
@@ -417,7 +403,6 @@ Language croatian
 	PolyglossiaName  croatian
 	QuoteStyle       polish
 	Encoding         iso8859-2
-	FontEncoding	 T1
 	LangCode         hr_HR
 End
 
@@ -428,7 +413,6 @@ Language czech
 	PolyglossiaName  czech
 	QuoteStyle       german
 	Encoding         iso8859-2
-	FontEncoding	 T1
 	LangCode         cs_CZ
 End
 
@@ -439,7 +423,6 @@ Language danish
 	PolyglossiaName  danish
 	QuoteStyle       danish
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         da_DK
 End
 
@@ -459,7 +442,6 @@ Language dutch
 	PolyglossiaOpts  "babelshorthands=true"
 	QuoteStyle       polish
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         nl_NL
 End
 
@@ -482,7 +464,6 @@ Language esperanto
 	PolyglossiaName  esperanto
 	QuoteStyle       english
 	Encoding         iso8859-3
-	FontEncoding	 IL3
 	LangCode         eo_EO
 End
 
@@ -492,7 +473,6 @@ Language estonian
 	PolyglossiaName  estonian
 	QuoteStyle       german
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         et_EE
 	PostBabelPreamble
 	\addto\extrasestonian{\bbl@deactivate{~}}
@@ -523,7 +503,6 @@ Language finnish
 	PolyglossiaName  finnish
 	QuoteStyle       swedish
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         fi_FI
 End
 
@@ -535,7 +514,6 @@ Language french
 	PolyglossiaName  french
 	QuoteStyle       french
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         fr_FR
 	PostBabelPreamble
 	\addto\extrasfrench{%
@@ -552,7 +530,6 @@ Language friulan
 	PolyglossiaName  friulan
 	QuoteStyle       french
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         fur_IT
 End
 
@@ -563,7 +540,6 @@ Language galician
 	PolyglossiaName  galician
 	QuoteStyle       french
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         gl_ES
 	PostBabelPreamble
 	\addto\shorthandsgalician{\galiciandeactivate{~}}
@@ -587,7 +563,6 @@ Language german
 	PolyglossiaOpts  "variant=german,spelling=old,babelshorthands=true"
 	QuoteStyle       german
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         de
 	LangVariety      alt
 End
@@ -600,7 +575,6 @@ Language ngerman
 	PolyglossiaOpts  "variant=german,spelling=new,babelshorthands=true"
 	QuoteStyle       german
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         de_DE
 End
 
@@ -615,7 +589,6 @@ Language german-ch
 	PolyglossiaOpts  "variant=swiss,spelling=new,babelshorthands=true"
 	QuoteStyle       swiss
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         de_CH
 End
 
@@ -629,7 +602,6 @@ Language german-ch-old
  	PolyglossiaOpts  "variant=swiss,spelling=old,babelshorthands=true"
  	QuoteStyle       swiss
  	Encoding         iso8859-15
-	FontEncoding	 T1
  	LangCode         de_CH
 End
 
@@ -699,7 +671,6 @@ Language icelandic
 	PolyglossiaName  icelandic
 	QuoteStyle       german
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         is_IS
 End
 
@@ -721,7 +692,6 @@ Language irish
 	PolyglossiaName  irish
 	QuoteStyle       english
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         ga_IE
 End
 
@@ -773,10 +743,9 @@ End
 # not yet supported by polyglossia
 # not supported by babel
 Language kazakh
-	GuiName		 "Kazakh"
-	Encoding         ascii
-	FontEncoding	 T2A
-	LangCode         kk_KZ
+	GuiName         "Kazakh"
+	Encoding        ascii
+	LangCode        kk_KZ
 	PostBabelPreamble
 	\input{t2aenc.def}
 	\AtBeginDocument{\fontencoding{T2A}\selectfont}
@@ -804,7 +773,6 @@ Language kurmanji
 	GuiName          "Kurmanji"
 	BabelName        kurmanji
 	Encoding         utf8
-	FontEncoding	 T1
 	LangCode         kmr
 	AsBabelOptions   true
 End
@@ -824,7 +792,6 @@ Language latin
 	BabelName        latin
 	PolyglossiaName  latin
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         la_LA
 End
 
@@ -836,7 +803,7 @@ Language latvian
 	PolyglossiaName  latvian
 	QuoteStyle       german
 	Encoding         iso8859-4
-	FontEncoding     L7x # (required for hyphenation but not set by babel)
+#	FontEncoding     L7x # (required for hyphenation but not set by babel)
 	LangCode         lv_LV
 	AsBabelOptions   true
 End
@@ -860,7 +827,6 @@ Language lowersorbian
 	PolyglossiaName  lsorbian
 	QuoteStyle       german
 	Encoding         iso8859-2
-	FontEncoding	 T1
 	LangCode         dsb_DE
 End
 
@@ -871,7 +837,6 @@ Language magyar
 	PolyglossiaName  magyar
 	QuoteStyle       polish
 	Encoding         iso8859-2
-	FontEncoding	 T1
 	LangCode         hu_HU
 End
 
@@ -922,7 +887,6 @@ Language norsk
 	PolyglossiaName  norsk
 	QuoteStyle       swiss
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         nb_NO
 End
 
@@ -933,7 +897,6 @@ Language nynorsk
 	PolyglossiaName  nynorsk
 	QuoteStyle       swiss
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         nn_NO
 End
 
@@ -976,7 +939,7 @@ Language polish
 	PolyglossiaName  polish
 	QuoteStyle       polish
 	Encoding         iso8859-2
-	FontEncoding     QX # (required for hyphenation but not set by babel)
+#	FontEncoding     QX # (required for hyphenation but not set by babel)
 	LangCode         pl_PL
 End
 
@@ -987,7 +950,6 @@ Language portuguese
 	PolyglossiaName  portuges
 	QuoteStyle       french
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         pt_PT
 End
 
@@ -998,7 +960,6 @@ Language romanian
 	PolyglossiaName  romanian
 	QuoteStyle       polish
 	Encoding         iso8859-16
-	FontEncoding	 T1
 	LangCode         ro_RO
 End
 
@@ -1028,7 +989,6 @@ Language samin
 	BabelName        samin
 	PolyglossiaName  samin
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         se_NO
 End
 
@@ -1073,7 +1033,6 @@ Language serbian-latin
 	PolyglossiaOpts  "script=Latin"
 	QuoteStyle       polish
 	Encoding         iso8859-2
-	FontEncoding	 T1
 	LangCode         sr_RS-Latin
 End
 
@@ -1084,7 +1043,6 @@ Language slovak
 	PolyglossiaName  slovak
 	QuoteStyle       german
 	Encoding         iso8859-2
-	FontEncoding	 T1
 	LangCode         sk_SK
 End
 
@@ -1094,7 +1052,6 @@ Language slovene
 	PolyglossiaName  slovenian
 	QuoteStyle       german
 	Encoding         iso8859-2
-	FontEncoding	 T1
 	LangCode         sl_SI
 End
 
@@ -1105,7 +1062,6 @@ Language spanish
 	PolyglossiaName  spanish
 	QuoteStyle       french
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         es_ES
 	PostBabelPreamble
 	\addto\shorthandsspanish{\spanishdeactivate{~<>}}
@@ -1119,7 +1075,6 @@ Language spanish-mexico
 	PolyglossiaName  spanish
 	QuoteStyle       french
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         es_MX
 	PostBabelPreamble
 	\addto\shorthandsspanish{\spanishdeactivate{~<>.}}
@@ -1133,7 +1088,6 @@ Language swedish
 	PolyglossiaName  swedish
 	QuoteStyle       swedish
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         sv_SE
 End
 
@@ -1168,7 +1122,7 @@ Language thai
 	PolyglossiaName  thai
 	QuoteStyle       english
 	Encoding         tis620-0
-	FontEncoding     LTH
+#	FontEncoding     LTH
 	LangCode         th_TH
 	PostBabelPreamble
 	\usepackage{thswitch}
@@ -1190,7 +1144,6 @@ Language turkish
 	PolyglossiaName  turkish
 	QuoteStyle       english
 	Encoding         iso8859-9
-	FontEncoding	 T1
 	LangCode         tr_TR
 	PostBabelPreamble
 	\usepackage{xkeyval}
@@ -1205,7 +1158,6 @@ Language turkmen
 	PolyglossiaName  turkmen
 	QuoteStyle       swiss
 	Encoding         utf8
-	FontEncoding	 T1
 	LangCode         tk_TM
 	AsBabelOptions   true
 End
@@ -1227,7 +1179,6 @@ Language uppersorbian
 	PolyglossiaName  usorbian
 	QuoteStyle       german
 	Encoding         iso8859-2
-	FontEncoding	 T1
 	LangCode         hsb_DE
 End
 
@@ -1249,7 +1200,6 @@ Language vietnamese
 	PolyglossiaName  vietnamese
 	QuoteStyle       english
 	Encoding         utf8
-	FontEncoding	 T5
 	LangCode         vi_VN
 	AsBabelOptions   true
 	Requires         vietnamese
@@ -1261,6 +1211,5 @@ Language welsh
 	PolyglossiaName  welsh
 	QuoteStyle       british
 	Encoding         iso8859-15
-	FontEncoding	 T1
 	LangCode         cy_GB
 End