diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 1464c2e2c5b..d0c25f9183e 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2005/11/23 08:52:48 jakob Exp $
+# $OpenBSD: Makefile,v 1.6 2005/11/30 08:33:16 jakob Exp $
 
 COMMENT=	"anti-spam filter"
 
-VERSION=	3.6.1
+VERSION=	3.6.2
 DISTNAME=	dspam-${VERSION}
 CATEGORIES=	mail
 
@@ -22,6 +22,8 @@ WANTLIB=		c m
 CONFIGURE_STYLE=	gnu
 SEPARATE_BUILD=		concurrent
 
+USE_LIBTOOL=		Yes
+
 CONFIGURE_ARGS+=	--with-dspam-home=/var/dspam \
 			--with-dspam-home-owner=_dspam \
 			--with-dspam-home-group=_dspam \
@@ -39,6 +41,7 @@ DOCS=		${WRKSRC}/README ${WRKSRC}/UPGRADING ${WRKSRC}/RELEASE.NOTES \
 
 EXAMPLESDIR=	${PREFIX}/share/examples/dspam
 DRIVER=
+DAEMON_SUPPORT=
 
 FLAVORS=	sqlite3 sqlite mysql pgsql hash clamav ldap
 FLAVOR?=	sqlite3
@@ -100,6 +103,10 @@ LIB_DEPENDS+=		sqlite3.8::databases/sqlite3
 DRIVER=			sqlite
 .endif
 
+.if empty(FLAVOR:L:Msqlite3) && empty(FLAVOR:L:Msqlite)
+DAEMON_SUPPORT=		Yes
+.endif
+
 .if ${FLAVOR:L:Mclamav}
 CONFIGURE_ARGS+=	--enable-clamav
 LIB_DEPENDS+=		clamav.1::security/clamav
@@ -107,13 +114,14 @@ LIB_DEPENDS+=		clamav.1::security/clamav
 
 .if ${FLAVOR:L:Mldap}
 CONFIGURE_ARGS+=	--enable-ldap
-LIB_DEPENDS+=		ldap_r.8,lber.8::databases/openldap
 CONFIGURE_ENV=		CPPFLAGS="-I${DEPBASE}/include" \
 			LDFLAGS="-L${DEPBASE}/lib"
+LIB_DEPENDS+=		ldap.8,lber.8::databases/openldap
 .endif
 
-.if empty(FLAVOR:L:Msqlite3) && empty(FLAVOR:L:Msqlite)
+.if !empty(DAEMON_SUPPORT)
 CONFIGURE_ARGS+=	--enable-daemon
+WANTLIB+=		pthread
 .endif
 
 post-install:
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index d7a5cc4c659..93790ce1c49 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1,4 +1,4 @@
-MD5 (dspam-3.6.1.tar.gz) = 6aad568823f297852dff4989da332e22
-SHA1 (dspam-3.6.1.tar.gz) = 864cd85d44350c6b4d203cde40d025cf5015af82
-RMD160 (dspam-3.6.1.tar.gz) = d93f73ad87ea0061e3b2c3d4dc84578872bce74d
-SIZE (dspam-3.6.1.tar.gz) = 739389
+SIZE (dspam-3.6.2.tar.gz) = 740001
+MD5 (dspam-3.6.2.tar.gz) = cde38b1fe37daf531475251e95253033
+SHA1 (dspam-3.6.2.tar.gz) = c9a034cb3fa6b34a019c040af04021df9dabc16a
+RMD160 (dspam-3.6.2.tar.gz) = fe973aae9b3ea14a52681e13cf59bdbc001ca3da