diff --git a/tests/00-doxygen/Makefile b/tests/00-doxygen/Makefile
index b8d933aee..ba3600b79 100644
--- a/tests/00-doxygen/Makefile
+++ b/tests/00-doxygen/Makefile
@@ -25,7 +25,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-DOCDIR=../../doc
+DOCDIR=../../tools/doxygen
 
 all: summary
 
diff --git a/doc/Doxyfile b/tools/doxygen/Doxyfile
similarity index 100%
rename from doc/Doxyfile
rename to tools/doxygen/Doxyfile
diff --git a/doc/Makefile b/tools/doxygen/Makefile
similarity index 98%
rename from doc/Makefile
rename to tools/doxygen/Makefile
index 1377e410c..e370fca6e 100644
--- a/doc/Makefile
+++ b/tools/doxygen/Makefile
@@ -1,4 +1,4 @@
-contiking := ..
+contiking := ../..
 basedirs	:= os arch
 empty		:=
 space		:= $(empty) $(empty)
diff --git a/doc/doc-style.css b/tools/doxygen/doc-style.css
similarity index 100%
rename from doc/doc-style.css
rename to tools/doxygen/doc-style.css
diff --git a/doc/mainpage.txt b/tools/doxygen/mainpage.txt
similarity index 100%
rename from doc/mainpage.txt
rename to tools/doxygen/mainpage.txt
diff --git a/doc/modules.txt b/tools/doxygen/modules.txt
similarity index 100%
rename from doc/modules.txt
rename to tools/doxygen/modules.txt
diff --git a/doc/pt-doc.txt b/tools/doxygen/pt-doc.txt
similarity index 100%
rename from doc/pt-doc.txt
rename to tools/doxygen/pt-doc.txt