diff --git a/src/tools/doxygen.jam b/src/tools/doxygen.jam
index f53a227c1..1e5362431 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
index 38f6ff0ee..936dabfaa 100644
--- a/src/tools/types/markdown.jam
+++ b/src/tools/types/markdown.jam
@@ -1,4 +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 : markdown md ;
+type MARKDOWN : md markdown ;