diff --git a/Makefile.am b/Makefile.am
index b4c2cde5..a9225586 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Process this file with automake to create Makefile.in
 
-SUBDIRS = . aclocal docs etc macos man src win32
+SUBDIRS = . aclocal doc etc macos man src win32
 
 EXTRA_DIST = ANNOUNCE CodingStyle PAM_README QUICKSTART README \
 	bootstrap Makefile.mak depcomp \
diff --git a/configure.in b/configure.in
index 9d38dbf4..4d4f3e89 100644
--- a/configure.in
+++ b/configure.in
@@ -966,11 +966,13 @@ AC_SUBST(pkgdata)
 AC_OUTPUT([
 Makefile
 aclocal/Makefile
-docs/Makefile
-docs/pkcs15-profile.5
+doc/Makefile
+doc/old/Makefile
+doc/src/Makefile
 etc/Makefile
 macos/Makefile
 man/Makefile
+man/pkcs15-profile.5
 src/Makefile
 src/common/Makefile
 src/include/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3cda9b72..0991b899 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,7 @@
 # Process this file with automake to create Makefile.in
 
+SUBDIRS = . old src
+
 MAINTAINERCLEANFILES = Makefile.in
 
 EXTRA_DIST = README export-wiki.sh export-wiki.xsl $(HTML)
@@ -20,23 +22,3 @@ HTML= AladdinEtokenPro.html AutoVersions.html BelgianEid.html CardOs.html \
 	SupportedHardware.html SwedishEid.html TaiwanEid.html TelseCos.html \
 	TroubleShooting.html WindowsCsp.html index.html pkcs11_keypair_gen.html
 
-# OLD
-XSLTPROC = xsltproc --xinclude
-
-default:
-	@echo -e "The following make targets are available:\n"
-	@echo -e "\thtml\t\tA single HTML page\n"
-	@echo -e "\tman\t\tMan pages for all functions\n"
-
-all: html man
-
-clean:
-	rm -rf html man
-
-html:
-	$(XSLTPROC) -o html/api.html src/api/html.xsl src/api/api.xml
-
-man:
-	$(XSLTPROC) -o man/ src/api/man.xsl src/api/api.xml
-
-.SILENT:
diff --git a/doc/old/Makefile.am b/doc/old/Makefile.am
index 0d9252b4..e5b5fe03 100644
--- a/doc/old/Makefile.am
+++ b/doc/old/Makefile.am
@@ -4,40 +4,10 @@ XSLTPROC = @XSLTPROC@
 HTMLFILES = opensc.html opensc.css opensc-es.html
 XMLFILES = opensc.xml opensc.xsl opensc-es.xml
 
-MAINTAINERCLEANFILES = Makefile.in pkcs15-profile.5
+MAINTAINERCLEANFILES = Makefile.in 
 
-MANSRC = \
-	pkcs15-crypt.1 \
-	pkcs15-init.1 \
-	cryptoflex-tool.1 \
-	opensc-config.1 \
-	opensc-explorer.1 \
-	opensc-tool.1 \
-	pkcs15-tool.1 \
-	pkcs11-tool.1 \
-	cardos-info.1 \
-	netkey-tool.1 \
-	opensc.7 \
-	pkcs15.7 \
-	sc_connect_card.3 \
-	sc_detect_card_presence.3 \
-	sc_disconnect_card.3 \
-	sc_establish_context.3 \
-	sc_file.3 \
-	sc_file_free.3 \
-	sc_file_new.3 \
-	sc_list_files.3 \
-	sc_lock.3 \
-	sc_read_binary.3 \
-	sc_read_record.3 \
-	sc_release_context.3 \
-	sc_select_file.3 \
-	sc_pkcs15_compute_signature.3
-
-man_MANS = $(MANSRC) pkcs15-profile.5
 noinst_DATA = $(HTMLFILES)
-EXTRA_DIST = $(MANSRC) pkcs15-profile.5.in pkcs-15v1_1.asn \
-	$(XMLFILES) $(HTMLFILES) doxygen.conf
+EXTRA_DIST = pkcs-15v1_1.asn $(XMLFILES) $(HTMLFILES) doxygen.conf
 
 STYLESHEET = opensc.xsl
 
diff --git a/doc/src/Makefile.am b/doc/src/Makefile.am
new file mode 100644
index 00000000..baa440c6
--- /dev/null
+++ b/doc/src/Makefile.am
@@ -0,0 +1,45 @@
+
+XMLFILES= api/file/sc_list_files.xml api/file/sc_write_binary.xml \
+	api/file/sc_delete_file.xml api/file/chapter.xml \
+	api/file/sc_create_file.xml api/file/sc_append_record.xml \
+	api/file/sc_read_record.xml api/file/sc_select_file.xml \
+	api/file/sc_read_binary.xml api/file/sc_update_record.xml \
+	api/file/sc_file_free.xml api/file/sc_update_binary.xml \
+	api/file/sc_file_dup.xml api/file/sc_write_record.xml \
+	api/file/sc_file_new.xml api/file/sc_delete_record.xml \
+	api/asn1/sc_format_asn1_entry.xml api/asn1/sc_asn1_print_tags.xml \
+	api/asn1/sc_asn1_find_tag.xml api/asn1/sc_copy_asn1_entry.xml \
+	api/asn1/sc_asn1_encode.xml api/asn1/chapter.xml \
+	api/asn1/sc_asn1_verify_tag.xml api/asn1/sc_asn1_skip_tag.xml \
+	api/asn1/sc_asn1_decode.xml api/asn1/sc_asn1_put_tag.xml \
+	api/asn1/sc_asn1_read_tag.xml api/apps/sc_update_dir.xml \
+	api/apps/chapter.xml api/apps/sc_free_apps.xml \
+	api/apps/sc_find_pkcs15_app.xml api/apps/sc_enum_apps.xml \
+	api/apps/sc_find_app_by_aid.xml api/init/sc_make_cache_dir.xml \
+	api/init/sc_get_cache_dir.xml api/init/chapter.xml \
+	api/init/sc_establish_context.xml api/init/sc_release_context.xml \
+	api/init/sc_card_valid.xml api/init/sc_set_card_driver.xml \
+	api/init/sc_connect_card.xml api/init/sc_disconnect_card.xml \
+	api/init/sc_detect_card_presence.xml api/types/sc_card_t.xml \
+	api/types/sc_path_t.xml api/types/chapter.xml \
+	api/types/sc_file_t.xml api/types/sc_asn1_entry.xml \
+	api/types/sc_app_info_t.xml api/card/sc_unlock.xml \
+	api/card/chapter.xml api/card/sc_format_apdu.xml \
+	api/card/sc_get_challenge.xml api/card/sc_put_data.xml \
+	api/card/sc_check_sw.xml api/card/sc_get_data.xml \
+	api/card/sc_lock.xml api/card/sc_transmit_apdu.xml \
+	api/card/sc_card_ctl.xml api/card/sc_wait_for_event.xml \
+	api/misc/chapter.xml api/util/sc_der_clear.xml \
+	api/util/chapter.xml api/util/sc_base64_encode.xml \
+	api/util/sc_strerror.xml api/util/sc_der_copy.xml \
+	api/util/sc_base64_decode.xml api/api.xml
+
+EXTRA_DIST = $(XMLFILES) api/api.css api/man.xsl api/html.xsl
+
+XSLTPROC = xsltproc --xinclude
+
+html:
+	$(XSLTPROC) -o html/api.html api/html.xsl api/api.xml
+
+man:
+	$(XSLTPROC) -o man/ api/man.xsl api/api.xml