diff -Naur openca-0.9.3-rc1/configure.in openca-0.9.3-rc1.oden/configure.in
--- openca-0.9.3-rc1/configure.in	2006-10-09 19:22:57.000000000 +0200
+++ openca-0.9.3-rc1.oden/configure.in	2007-08-17 13:26:40.000000000 +0200
@@ -4,9 +4,7 @@
 
 AC_PREREQ(2.50)
 AC_COPYRIGHT(Copyright 1999-2006 by Massimiliano Pala and OpenCA Team)
-dnl AC_CONFIG_SUBDIRS(src/openca-sv)
 
-# AC_CONFIG_SRCDIR([src/modules/openca-sv/include/openca/sv.h])
 # AC_CONFIG_HEADER([config.h])
 
 dnl Check for install program
@@ -98,45 +96,6 @@
 	dnl                        openssl configuration
 	dnl ############################### END ##############################
 
-	dnl ############################## BEGIN #############################
-	dnl                       module configuration
-
-	dnl deactivation of external modules to support package maintainers
-
-	EXTERNAL_MODULES="yes"
-	AC_ARG_ENABLE( external-modules,
-		AC_HELP_STRING( [--disable-external-modules],
-				[disable the installation of external modules]),
-		[EXTERNAL_MODULES=$enableval],
-		[EXTERNAL_MODULES="yes"])
-	AC_SUBST( EXTERNAL_MODULES)
-
-	dnl optional modules
-
-	dnl OCSP daemon
-	dnl AC_ARG_ENABLE( ocspd,
-	dnl 	AC_HELP_STRING( [--enable-ocspd], [enable OCSP daemon]),
-	dnl 	[OCSPD_MODULE="ocspd"
-	dnl 	AC_CONFIG_SUBDIRS( src/ocspd)],
-	dnl 	[OCSPD_MODULE=""])
-
-	dnl OPTIONAL_C_MODULES="$OPTIONAL_C_MODULES $OCSPD_MODULE"
-
-	dnl SCEP daemon
-	dnl AC_ARG_ENABLE( scep,
-	dnl 	AC_HELP_STRING( [--enable-scep], [enable SCEP daemon]),
-	dnl 	[SCEP_MODULE="scep"
-	dnl 	AC_CONFIG_SUBDIRS( src/scep)],
-	dnl 	[SCEP_MODULE=""])
-	AC_ARG_ENABLE( scep,
-		AC_HELP_STRING( [--enable-scep], [enable SCEP daemon]),
-		[SCEP_MODULE="scep"],
-		[SCEP_MODULE=""])
-
-	dnl OPTIONAL_C_MODULES="$OPTIONAL_C_MODULES $SCEP_MODULE"
-
-	dnl AC_SUBST( OPTIONAL_C_MODULES)
-
 	AC_ARG_WITH( build-dir,
 		AC_HELP_STRING( [--with-build-dir=DIR], [package building dir]),
 		build_dir=$withval, build_dir=)
diff -Naur openca-0.9.3-rc1/Makefile.global-vars.in openca-0.9.3-rc1.oden/Makefile.global-vars.in
--- openca-0.9.3-rc1/Makefile.global-vars.in	2006-09-19 21:48:57.000000000 +0200
+++ openca-0.9.3-rc1.oden/Makefile.global-vars.in	2007-08-17 13:21:59.000000000 +0200
@@ -121,8 +121,6 @@
 
 POD2MAN			= @POD2MAN@
 
-EXTERNAL_MODULES	= @EXTERNAL_MODULES@
-# OPTIONAL_C_MODULES	= @OPTIONAL_C_MODULES@
 PERL_MAKEFILE_OPTS	= @PERL_MAKEFILE_OPTS@
 
 ## this is an implementation of GNU's "install -D"
diff -Naur openca-0.9.3-rc1/src/Makefile openca-0.9.3-rc1.oden/src/Makefile
--- openca-0.9.3-rc1/src/Makefile	2006-09-20 23:15:52.000000000 +0200
+++ openca-0.9.3-rc1.oden/src/Makefile	2007-08-17 13:29:12.000000000 +0200
@@ -6,32 +6,17 @@
 include $(TOP)/Makefile.global-vars
 
 COMMON_DIR = common
-MODULE_DIR = modules
-EXT_MODULE_DIR = ext-modules
-OCSPD_DIR  = ocspd
-SCEP_DIR   = scep
-OPENCA_SV  = openca-sv
 SCRIPT_DIR = scripts
 WEB_DIR    = web-interfaces
 
 SUBDIRS = \
 	$(COMMON_DIR)	\
-	$(MODULE_DIR)	\
-	$(EXT_MODULE_DIR) \
 	$(SCRIPT_DIR)	\
 	$(WEB_DIR)
 
-#	$(OPTIONAL_C_MODULES)
-#	$(OCSPD_DIR)	\
-#	$(OPENCA_SV)	
-
-## MODULES.c = \
-##	openca-sv \
-##	$(OPTIONAL_C_MODULES)
-
 #---- variable settings above, rules below ----
 
-.PHONY:	default test install-batch install-ca install-node install-ra install-ldap install-common install-modules install-pub install-scep clean clean.local distclean
+.PHONY:	default test install-batch install-ca install-node install-ra install-ldap install-common install-pub install-scep clean clean.local distclean
 
 default::	$(SUBDIRS)
 
@@ -41,19 +26,6 @@
 install-common:: install-bin
 		@$(MAKE) $(COMMON_DIR) SUBTARGET=install
 		@$(MAKE) $(SCRIPT_DIR) SUBTARGET=install
-		@## the modules have their own spec-files
-		@if [ $(package_build) != "yes" ]; then \
-			echo installing modules because it is not a package build; \
-			$(MAKE) $(MODULE_DIR) SUBTARGET=install; \
-			$(MAKE) $(EXT_MODULE_DIR) SUBTARGET=install; \
-		else \
-			echo not installing modules because it is a package build; \
-		fi
-
-#			$(MAKE) $(OPENCA_SV) SUBTARGET=install; \
-#			if [ x"$(OPTIONAL_C_MODULES)" != x ]; then \
-#			   $(MAKE) $(OPTIONAL_C_MODULES) SUBTARGET=install; \
-#			fi
 
 install-bin::
 	$(MAKE) $(SCRIPT_DIR) SUBTARGET=install
@@ -61,10 +33,6 @@
 install-batch install-ca install-node install-ra install-ldap install-pub install-scep::
 		$(MAKE) $(WEB_DIR) SUBTARGET=$@
 
-install-modules:
-	@$(MAKE) $(MODULE_DIR) SUBTARGET=install
-	@$(MAKE) $(EXT_MODULE_DIR) SUBTARGET=install
-
 test clean distclean::
 		$(MAKE) $(SUBDIRS) SUBTARGET=$@