diff --git a/src/tools/doxygen.jam b/src/tools/doxygen.jam
index f53a227c1c..1e53624311 100644
--- a/src/tools/doxygen.jam
+++ b/src/tools/doxygen.jam
@@ -100,7 +100,7 @@ rule init ( name ? )
         .doxproc = $(.doxproc:D)/doxproc.py ;
 
         generators.register-composing doxygen.headers-to-doxyfile
-            : H HPP CPP : DOXYFILE ;
+            : H HPP CPP MARKDOWN : DOXYFILE ;
         generators.register-standard doxygen.run
             : DOXYFILE : DOXYGEN_XML_MULTIFILE ;
         generators.register-standard doxygen.xml-dir-to-boostbook
diff --git a/src/tools/types/markdown.jam b/src/tools/types/markdown.jam
new file mode 100644
index 0000000000..936dabfaa4
--- /dev/null
+++ b/src/tools/types/markdown.jam
@@ -0,0 +1,4 @@
+# Copyright David Abrahams 2004. Distributed under the Boost
+# Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+type MARKDOWN : md markdown ;
diff --git a/src/tools/types/markdown.py b/src/tools/types/markdown.py
new file mode 100644
index 0000000000..c689c9a68e
--- /dev/null
+++ b/src/tools/types/markdown.py
@@ -0,0 +1,10 @@
+# Copyright David Abrahams 2004. Distributed under the Boost
+# Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+from b2.build import type
+
+def register ():
+    type.register_type ('MARKDOWN', ['markdown', 'md'])
+
+register ()