--- apache-2.eclass.old	2010-07-07 16:38:13.000000000 +0200
+++ apache-2.eclass	2010-07-07 16:38:45.000000000 +0200
@@ -245,13 +245,8 @@ setup_modules() {
 		MY_CONF="${MY_CONF} --without-ssl --disable-ssl"
 	fi
 
-	if use threads || has ${MY_MPM} ${IUSE_MPMS_THREAD} ; then
-		MY_CONF="${MY_CONF} --enable-cgid=${mod_type}"
-		MY_MODS="${MY_MODS} cgid"
-	else
-		MY_CONF="${MY_CONF} --enable-cgi=${mod_type}"
-		MY_MODS="${MY_MODS} cgi"
-	fi
+	MY_CONF="${MY_CONF} --enable-cgi=${mod_type} --enable-cgid=${mod_type}"
+	MY_MODS="${MY_MODS} cgi cgid"
 
 	if use suexec ; then
 		elog "You can manipulate several configure options of suexec"