diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5ecb1afb70..60a0327ff7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2092,6 +2092,7 @@ dist_layouts_DATA =\
 	layouts/theorems-starred.module \
 	layouts/theorems-std.module \
 	layouts/theorems-without-preamble.inc \
+	layouts/todonotes.module \
 	layouts/treport.layout \
 	layouts/tufte-book.layout \
 	layouts/tufte-handout.layout
diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index dfc42a3be2..da4c2e4fa1 100644
--- a/lib/doc/LaTeXConfig.lyx
+++ b/lib/doc/LaTeXConfig.lyx
@@ -6193,13 +6193,64 @@ macros/latex/contrib/tcolorbox/
 
 \begin_layout Description
 
-\change_inserted -712698321 1404300960
+\change_inserted -712698321 1409489193
 Notes: The package 
 \family sans
 tcolorbox
 \family default
 \color none
  is used to produce fancy boxes.
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted -712698321 1409489213
+TODO Notes module
+\end_layout
+
+\begin_layout Subsubsection
+
+\change_inserted -712698321 1409489210
+todonotes
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1409489194
+Found: 
+\begin_inset Info
+type  "package"
+arg   "todonotes"
+\end_inset
+
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1409489226
+CTAN: 
+\family typewriter
+macros/latex/contrib/todonotes/
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1409489236
+Notes: The package 
+\family sans
+todonotes
+\family default
+\color none
+ is used to insert 
+\begin_inset Quotes eld
+\end_inset
+
+TODO
+\begin_inset Quotes erd
+\end_inset
+
+ notes into documents.
 \change_unchanged
 
 \end_layout
diff --git a/lib/layouts/todonotes.module b/lib/layouts/todonotes.module
new file mode 100644
index 0000000000..d18ef3bf17
--- /dev/null
+++ b/lib/layouts/todonotes.module
@@ -0,0 +1,132 @@
+#\DeclareLyXModule[todonotes.sty]{TODO Notes}
+#DescriptionBegin
+#Provides custom insets to insert TODO items in your document
+#(using the todonotes package). In order to generate a 'List of TODOs',
+#the module provides a paragraph style.
+#DescriptionEnd
+
+# Authors: Stephen <stephen4mailinglists@googlemail.com>
+#          Jürgen Spitzmüller <spitz@lyx.org>
+
+Format 48
+
+#
+# List of TODOs
+#
+
+Style List_of_TODOs
+	KeepEmpty	1
+	LatexType	Command
+	LatexName	listoftodos
+	Margin		First_Dynamic
+	NextNoIndent	1
+	ParSkip		0
+	TopSep		0
+	BottomSep	0.25
+	ParSep		0
+	Align		Center
+	LabelType	Static
+	LabelBottomSep	0
+	LeftMargin	MMMMM
+	LabelString	"[LIST of TODOs]"
+
+	LabelFont 
+	    Family	typewriter
+	    Series	Medium
+	    Size	Small
+	    Color	latex
+	EndFont
+
+	Argument 1
+		LabelString	"Heading"
+		MenuString	"List of TODOs Heading|s"
+		Tooltip		"Enter a custom header for the List of TODOs here"
+	EndArgument
+	Requires	todonotes
+End
+
+
+#
+# TODO Notes
+#
+
+InsetLayout Flex:TODO_Note_(Margin)
+	LyxType		custom
+	LabelString	"TODO (Margin)"
+	Decoration	classic
+	BgColor		blue
+	Font
+	    Color	yellow
+	    Family	Typewriter
+	EndFont
+	LabelFont
+	    Color	blue
+	    Family	Sans
+	    Size	Small
+	EndFont
+	MultiPar	true
+	LatexType	command
+	LatexName	todo
+	Argument 1
+		LabelString	"Options"
+		MenuString	"TODO Note Options|s"
+		Tooltip		"See the todonotes manual for possible options"
+	EndArgument
+	Requires	todonotes
+End
+
+
+InsetLayout Flex:TODO_Note_(inline)
+	CopyStyle	Flex:TODO_Note_(Margin)
+	LabelString	"TODO (Inline)"
+	Argument 1
+		LabelString	"Options"
+		MenuString	"TODO Note Options|s"
+		PresetArg	inline
+	EndArgument
+End
+
+
+#
+# Specific Notes
+#
+
+InsetLayout Flex:Missing_Figure
+	CopyStyle	Flex:TODO_Note_(Margin)
+	LabelString	"Missing Figure"
+	MultiPar	false
+	LatexName	missingfigure
+	Argument 1
+		LabelString	"Options"
+		MenuString	"Missing Figure Note Options|s"
+		Tooltip		"See the todonotes manual for possible options"
+	EndArgument
+End
+
+
+#
+# Backwards compatibility to user-provided
+# modules on the LyX wiki
+#
+# FIXME: uncomment these when #9000 is fixed.
+
+#InsetLayout TODO
+#	ObsoletedBy           Flex:TODO_Note_(Margin)
+#End
+#
+#InsetLayout MakeTableOfToDos
+#	ObsoletedBy           List_of_TODOs
+#End
+#
+#InsetLayout Todo[Inline]
+#	ObsoletedBy           Flex:TODO_Note_(inline)
+#End
+#
+#InsetLayout Todo[margin]
+#	ObsoletedBy           Flex:TODO_Note_(Margin)
+#End
+#
+#InsetLayout MissingFigure
+#	ObsoletedBy           Flex:Missing_Figure
+#End
+
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index d70dcd7081..a7974b62c5 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -746,7 +746,8 @@ char const * simplefeatures[] = {
 	"sectionbox",
 	"tcolorbox",
 	"pdfcomment",
-	"fixme"
+	"fixme",
+	"todonotes"
 };
 
 char const * bibliofeatures[] = {