diff --git a/make/doxygen.mk b/make/doxygen.mk
index b8a960d6..7fd7e4b1 100644
--- a/make/doxygen.mk
+++ b/make/doxygen.mk
@@ -28,11 +28,13 @@ DX_FALLBACK_CONF_TMPL   ?= $(DX_INCLUDE_TMPL_DIR)/doxygen.conf.tmpl
 
 
 # replaced pattern defaults
-DX_FILE_PATTERNS        ?= *.h
+DX_FILE_PATTERNS        ?= *.h *.c *.cpp
 DX_INPUT_DIRS           ?= $(TOPDIR)/include
 DX_SRC_IS_JAVA          ?= NO
 DX_EXCLUDE_FILES        ?= 
 DX_INCLUDE_PATH         ?= 
+DX_RECURSIVE            ?= YES
+DX_EXTRACT_STATIC       ?= NO
 
 all: html
 install: install.done
@@ -93,6 +95,8 @@ $(DX_DOXYGEN_CONF): $(firstword $(wildcard $(DX_DOXYGEN_CONF).tmpl $(DX_FALLBACK
 		s%__SRC_IS_JAVA__%$(DX_SRC_IS_JAVA)%g; \
 		s%__EXCLUDE_FILES__%$(DX_EXCLUDE_FILES)%g; \
 		s%__INCLUDE_PATH__%$(DX_INCLUDE_PATH)%g; \
+		s%__RECURSIVE__%$(DX_RECURSIVE)%g; \
+		s%__EXTRACT_STATIC__%$(DX_EXTRACT_STATIC)%g; \
 	" $< > $@
 
 doxygen-default-includes.done: $(DX_DOXYGEN_CONF)
diff --git a/tmpl/doxygen/doxygen.conf.tmpl b/tmpl/doxygen/doxygen.conf.tmpl
index 212aa6ba..f9092c39 100644
--- a/tmpl/doxygen/doxygen.conf.tmpl
+++ b/tmpl/doxygen/doxygen.conf.tmpl
@@ -1,9 +1,9 @@
 PROJECT_NAME           = __PROJECT__
 PROJECT_NUMBER         = __VERSION__
 PROJECT_BRIEF          = "__PROJECT_SUMMARY__"
-INPUT                  = __PROJECT_TOPDIR__/tools
-#FILE_PATTERNS          = *.h *.cpp
-RECURSIVE              = YES
+INPUT                  = __INPUT_DIRS__
+FILE_PATTERNS          = __FILE_PATTERNS__
+RECURSIVE              = __RECURSIVE__
 GENERATE_LATEX         = NO
 PAPER_TYPE             = a4
 PREDEFINED             = STRIPPED_DOWN_VERSION \
@@ -17,4 +17,7 @@ DIRECTORY_GRAPH        = YES
 HTML_HEADER            = header.html
 HTML_FOOTER            = footer.html 
 HTML_EXTRA_STYLESHEET  = styles.css
+EXCLUDE_SYMLINKS       = YES
+EXTRACT_STATIC         = __EXTRACT_STATIC__
+