diff --git a/doc/Makefile b/doc/Makefile
index 5e1591985..5f066fffc 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,4 @@
-basedirs	:= core cpu platform
+basedirs	:= core cpu platform apps
 manuals		:= $(shell find ./ -name "*.txt")
 filetypes	:= -iwholename "*/doc/*.txt"
 empty		:=
diff --git a/doc/apps.txt b/doc/apps.txt
new file mode 100644
index 000000000..08bf4076a
--- /dev/null
+++ b/doc/apps.txt
@@ -0,0 +1,13 @@
+/**
+ * \defgroup apps Applications
+ *
+ * Contiki provides a set of apps that provide functionalities such as a
+ * web server.
+ * 
+ * To include an App in your software project specify in you makefile
+@code
+APPS = list of apps
+@endcode
+ *
+ * @{ */
+/** @} */
diff --git a/doc/cpu.txt b/doc/cpu.txt
new file mode 100644
index 000000000..421ee6bdd
--- /dev/null
+++ b/doc/cpu.txt
@@ -0,0 +1,51 @@
+/**
+\defgroup cpu Contiki CPUs
+@{
+*/
+
+/**
+ * \defgroup avr AVR
+ * \addtogroup cpu
+ * @{ */
+/** @} */
+
+/**
+ * \addtogroup avr 
+ * \defgroup wireless Wireless 
+ * @{ */
+/** @} */
+
+/**
+ * \defgroup arm ARM
+ * \addtogroup cpu
+ * @{ */
+/** @} */
+
+/**
+ * \defgroup stm32w-cpu STM32W108
+ * \addtogroup cpu
+ * @{ */
+/** @} */
+
+/**
+ * \defgroup ccxxx CCxxx
+ * \addtogroup cpu
+ * @{ */
+/** @} */
+
+/**
+ * \defgroup native Native
+ * \addtogroup cpu
+ * @{ */
+/** @} */
+
+/**
+ * \defgroup x86 x86
+ * \addtogroup cpu
+ * @{ */
+/** @} */
+
+
+/** 6502  arm  avr  cc2430  cc2538  cc253x  mc1322x  msp430  native  pic32  stm32w108  x86  z80 */
+
+/** @} */