diff --git a/ccid/Doxyfile.in b/ccid/Doxyfile.in
index c238b68..6cbf358 100644
--- a/ccid/Doxyfile.in
+++ b/ccid/Doxyfile.in
@@ -2,7 +2,7 @@ PROJECT_NAME           = @PACKAGE_NAME@
 PROJECT_NUMBER         = @PACKAGE_VERSION@
 OUTPUT_DIRECTORY       = @builddir@/doc
 STRIP_FROM_PATH        = @top_srcdir@/src
-INPUT                  = @top_srcdir@/src @top_srcdir@/README.dox
+INPUT                  = @top_srcdir@/src 
 FILE_PATTERNS          = *.c *.h
 EXCLUDE_PATTERNS       = */opensc/*
 RECURSIVE              = YES
diff --git a/ccid/README.dox b/ccid/README.dox
index e140f82..6b75b19 100644
--- a/ccid/README.dox
+++ b/ccid/README.dox
@@ -68,4 +68,10 @@ Questions
 
 For questions, please use http://sourceforge.net/projects/vsmartcard/support
 
+=========
+API index
+=========
+
+.. doxygenindex::
+
 .. @author Frank Morgner <morgner@informatik.hu-berlin.de>
diff --git a/doc/conf.py b/doc/conf.py
index 591801d..7bf50db 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -11,7 +11,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import sys, os, breathe
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -25,7 +25,7 @@ import sys, os
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
+extensions = ["breathe"]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -214,3 +214,6 @@ man_pages = [
     ('index', 'virtualsmartcardarchitecture', u'Virtual Smartcard Architecture Documentation',
      [u'Dominik Oepen, Frank Morgner'], 1)
 ]
+
+breathe_projects = {"ccid": "doxygen/ccid"}
+breathe_default_project = "ccid"
diff --git a/doc/doxygen/ccid b/doc/doxygen/ccid
new file mode 120000
index 0000000..e179857
--- /dev/null
+++ b/doc/doxygen/ccid
@@ -0,0 +1 @@
+../../ccid/doc/xml/
\ No newline at end of file
diff --git a/doc/doxygen/npa b/doc/doxygen/npa
new file mode 120000
index 0000000..ce5cd37
--- /dev/null
+++ b/doc/doxygen/npa
@@ -0,0 +1 @@
+../../npa/doc/xml/
\ No newline at end of file