diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 632b36303d..c97cae55e8 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -56,4 +56,8 @@ Format LaTeX feature                        LyX feature
 349    XeTeX                                \use_xetex
 350    ?                                    \default_output_format
 351    ?                                    \backgroundcolor
+353    \printsubindex                       InsetIndex
+354    \printindex*, \printsubindex*        InsetIndex
+355    \sout                                InsetIndex
+356    \uuline, \uwave                      InsetIndex
 
diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index ade1fe03d4..144dd10607 100644
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -165,7 +165,7 @@ extern bool noweb_mode;
 /// Did we recognize any pdflatex-only construct?
 extern bool pdflatex;
 /// LyX format that is created by tex2lyx
-int const LYX_FORMAT = 351;
+int const LYX_FORMAT = 356;
 
 /// path of the master .tex file
 extern std::string getMasterFilePath();
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 2c4aac4059..086bbbef8b 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2583,7 +2583,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 
 		else if (t.cs() == "index") {
 			context.check_layout(os);
-			begin_inset(os, "Index\n");
+			begin_inset(os, "Index idx\n");
 			os << "status collapsed\n";
 			parse_text_in_inset(p, os, FLAG_ITEM, false, context, "Index");
 			end_inset(os);
@@ -2615,6 +2615,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		else if (t.cs() == "printindex") {
 			context.check_layout(os);
 			begin_command_inset(os, "index_print", "printindex");
+			os << "type \"idx\"\n";
 			end_inset(os);
 			skip_spaces_braces(p);
 		}