diff --git a/ccid/Doxyfile.in b/ccid/Doxyfile.in
deleted file mode 100644
index 29c369f..0000000
--- a/ccid/Doxyfile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-PROJECT_NAME           = @PACKAGE_NAME@
-PROJECT_NUMBER         = @PACKAGE_VERSION@
-OUTPUT_DIRECTORY       = @builddir@/doc
-STRIP_FROM_PATH        = @top_srcdir@/src
-INPUT                  = @top_srcdir@/src 
-FILE_PATTERNS          = *.c *.h
-EXCLUDE_PATTERNS       = */opensc/*
-RECURSIVE              = YES
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = YES
-PREDEFINED             = __attribute__(x)=
-EXAMPLE_PATH           = @top_srcdir@/src
-GENERATE_HTML          = YES
-GENERATE_TAGFILE       = @builddir@/doc/$(PROJECT).tag
-GENERATE_XML           = YES
-XML_OUTPUT             = xml
diff --git a/ccid/Makefile.am b/ccid/Makefile.am
index d6b6063..4bc268c 100644
--- a/ccid/Makefile.am
+++ b/ccid/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src m4 patches
 
-EXTRA_DIST = README.dox Doxyfile.in apdus
+EXTRA_DIST = README.dox apdus
 
 do_subst = sed \
 	   -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \
@@ -13,13 +13,3 @@ do_subst = sed \
 	   -e 's,[@]includedir[@],$(includedir),g' \
 	   -e 's,[@]VERSION[@],$(VERSION),g' \
 	   -e 's,[@]top_srcdir[@],$(top_srcdir),g'
-
-if DOC_ENABLED
-.PHONY: doc
-doc :
-	$(do_subst) < $(srcdir)/Doxyfile.in > Doxyfile
-	$(DOXYGEN) Doxyfile
-endif
-
-clean-local:
-	rm -rf doc Doxyfile
diff --git a/ccid/configure.ac b/ccid/configure.ac
index 22557dc..c834c19 100644
--- a/ccid/configure.ac
+++ b/ccid/configure.ac
@@ -134,19 +134,6 @@ fi
 AM_CONDITIONAL(WITH_CATS, test "x${enable_cats}" != "xno")
 
 
-# Documentation (default: no)
-AC_ARG_ENABLE([doc],AS_HELP_STRING([--enable-doc],[Enable documentation generation.]),[enable_doc=$enableval],[enable_doc="no"])
-if test x"$enable_doc" = "xyes"
-then
-    AC_PATH_PROG([DOXYGEN], [doxygen])
-    if test x$DOXYGEN = x
-    then
-        AC_MSG_ERROR([doxygen is mandatory.])
-    fi
-fi
-AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes])
-
-
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h memory.h stdint.h stdlib.h string.h sys/ioctl.h unistd.h])
 
@@ -193,7 +180,6 @@ PCSC_LIBS:            ${PCSC_LIBS}
 CCID emulator:        ${enable_ccid}
 PACE support:         ${enable_pace}
 CAT-S/CAT-C Tool:     ${enable_cats}
-Documentation:        ${enable_doc}
 
 EOF