--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -162,0 +162,3 @@ 
+	# contrib modules
+	cd ${S}/contrib
+	epatch ${FILESDIR}/contrib-smbk5pwd-Makefile.patch
@@ -231,1 +234,1 @@ 
-	# special kerberos stuff
---
+	# openldap/contrib
@@ -233,5 +236,37 @@ 
-	if ! use minimal && use kerberos ; then
-		cd ${S}/contrib/slapd-modules/passwd/ && \
-		${CC} -shared -I../../../include ${CFLAGS} -fPIC \
-		-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
-		die "failed to compile kerberos module"
---
+	if ! use minimal ; then
+		# dsaschema
+			einfo "Building contributed dsaschema"
+			cd ${S}/contrib/slapd-modules/dsaschema
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			-Wall -o libdsaschema-plugin.so dsaschema.c || \
+			die "failed to compile dsaschema module"
+		# kerberos passwd
+		if use kerberos ; then
+			einfo "Building contributed pw-kerberos" 
+			cd ${S}/contrib/slapd-modules/passwd/ && \
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
+			die "failed to compile kerberos password module"
+		fi
+		# netscape mta-md5 password
+			einfo "Building contributed pw-netscape"
+			cd ${S}/contrib/slapd-modules/passwd/ && \
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			-o pw-netscape.so netscape.c || \
+			die "failed to compile netscape password module"
+		# smbk5pwd overlay
+		# Note: this modules builds, but may not work with
+		#   Gentoo's MIT-Kerberos.  It was designed for Heimdal
+		#   Kerberos. 
+			einfo "Building contributed smbk5pwd"
+			local mydef
+			use samba && mydef="-DDO_SAMBA"
+			use kerberos && mydef="${mydef} -DDO_KRB5"
+			cd ${S}/contrib/slapd-modules/smbk5pwd && \
+			DEFS="${mydef}" emake
+		# addrdnvalues
+			einfo "Building contributed addrdnvalues"
+			cd ${S}/contrib/slapi-plugins/addrdnvalues/ && \
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			-o libaddrdnvalues-plugin.so addrdnvalues.c || \
+			die "failed to compile addrdnvalues plugin"
@@ -297,3 +332,14 @@ 
-		if use kerberos && [ -f ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
-			insinto /usr/$(get_libdir)/openldap/openldap
-			doins ${S}/contrib/slapd-modules/passwd/pw-kerberos.so || \
---
+		# install contributed modules
+		if [ -e ${S}/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];
+		then
+			cd ${S}/contrib/slapd-modules/dsaschema/
+			newdoc README README.contrib.dsaschema
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe libdsaschema-plugin.so || \
+			die "failed to install dsaschema module"
+		fi
+		if [ -e ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
+			cd ${S}/contrib/slapd-modules/passwd/
+			newdoc README README.contrib.passwd
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe pw-kerberos.so || \
@@ -302,0 +348,31 @@ 
+		if [ -e ${S}/contrib/slapd-modules/passwd/pw-netscape.so ]; then
+			cd ${S}/contrib/slapd-modules/passwd/
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe ${S}/contrib/slapd-modules/passwd/pw-netscape.so || \
+			die "failed to install Netscape MTA-MD5 passwd module"
+		fi
+		if [ -e ${S}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then
+			cd ${S}/contrib/slapd-modules/smbk5pwd
+			newdoc README.contrib.smbk5pwd
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe smbk5pwd.la
+			cd ${S}/contrib/slapd-modules/smbk5pwd/.libs
+			doexe smbk5pwd.so* || \
+			die "failed to install smbk5pwd overlay module"
+		fi
+		if [ -e ${S}/contrib/slapd-tools/statslog ]; then
+			cd ${S}/contrib/slapd-tools
+			exeinto /usr/bin
+			newexe statslog ldapstatslog || \
+			die "failed to install ldapstatslog script"
+		fi
+		if [ -e
+			${S}/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
+		then
+			cd ${S}/contrib/slapi-plugins/addrdnvalues
+			newdoc README README.contrib.addrdnvalues
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe libaddrdnvalues-plugin.so || \
+			die "failed to install addrdnvalues plugin"
+		fi
+