diff --git a/dist/makefile b/dist/makefile
index 33919a7b18..97a69a87c0 100644
--- a/dist/makefile
+++ b/dist/makefile
@@ -117,3 +117,6 @@ flash: all
 
 term:
 	$(TERM) $(PORT)
+
+doc:
+	make -BC $(RIOTBASE) doc
diff --git a/doc/doxygen/makefile b/doc/doxygen/makefile
new file mode 100644
index 0000000000..7150229df4
--- /dev/null
+++ b/doc/doxygen/makefile
@@ -0,0 +1,3 @@
+doc:
+	doxygen riot.doxyfile
+
diff --git a/doc/doxygen/ukleos.doxyfile b/doc/doxygen/riot.doxyfile
similarity index 100%
rename from doc/doxygen/ukleos.doxyfile
rename to doc/doxygen/riot.doxyfile
diff --git a/makefile b/makefile
index 88fd8667a2..3ee0eb7bc0 100644
--- a/makefile
+++ b/makefile
@@ -6,4 +6,5 @@ all:
 clean:
 	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
 
-	
+doc:
+	make -BC doc/doxygen