diff --git a/sysutils/login_ldap/Makefile b/sysutils/login_ldap/Makefile
index b448c5f102e..27c02481e56 100644
--- a/sysutils/login_ldap/Makefile
+++ b/sysutils/login_ldap/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.8 2007/09/15 21:14:02 merdely Exp $
+# $OpenBSD: Makefile,v 1.9 2008/02/14 16:19:49 merdely Exp $
 
 COMMENT=	provide ldap authentication type
 
-DISTNAME=	login_ldap-3.3
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	login_ldap-3.51
 CATEGORIES=    	sysutils	
 
-HOMEPAGE=	http://www.ifost.org.au/~peterw/	
-MASTER_SITES=	${HOMEPAGE}
+HOMEPAGE=	http://sourceforge.net/projects/login-ldap/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=login-ldap/}
 
-MAINTAINER=	Peter Werner <peterw@ifost.org.au>
+MAINTAINER=	Michael Erdely <merdely@openbsd.org>
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes 
@@ -21,7 +20,7 @@ WANTLIB=		c
 LIB_DEPENDS=	lber,ldap:openldap-client-*:databases/openldap
 NO_REGRESS=	Yes
 
-pre-fake:
-	perl -pi -e "s@/usr/local@${PREFIX}@" ${WRKSRC}/login_ldap.8
+pre-configure:
+	@perl -pi -e "s@/usr/local@${PREFIX}@" ${WRKSRC}/login_ldap.8
 
 .include <bsd.port.mk>
diff --git a/sysutils/login_ldap/distinfo b/sysutils/login_ldap/distinfo
index da51271a471..0acbb70517c 100644
--- a/sysutils/login_ldap/distinfo
+++ b/sysutils/login_ldap/distinfo
@@ -1,5 +1,5 @@
-MD5 (login_ldap-3.3.tar.gz) = UukF1UoTbD2FAVj091SKPw==
-RMD160 (login_ldap-3.3.tar.gz) = nSV0610tEWzlV19Ph0SQLP2hOQE=
-SHA1 (login_ldap-3.3.tar.gz) = oeAVa366IgR+8tcGkTt20GqIQHQ=
-SHA256 (login_ldap-3.3.tar.gz) = 8K04H+q7VkTWXJBTck6XqtZ1JJs6TsxcZknxd9CY1Vw=
-SIZE (login_ldap-3.3.tar.gz) = 10532
+MD5 (login_ldap-3.51.tar.gz) = 718G/47FcxY22hRctk6ihQ==
+RMD160 (login_ldap-3.51.tar.gz) = KFtDGdCTo/cO/z2Wp4B9PAZ8naU=
+SHA1 (login_ldap-3.51.tar.gz) = n3C2TRi/imswUWd1rQ/SJepJL3Y=
+SHA256 (login_ldap-3.51.tar.gz) = Ai6uUsmxCa4ogl9l/kBly6ra7l06c0l2uG/okiPd2Bk=
+SIZE (login_ldap-3.51.tar.gz) = 14601
diff --git a/sysutils/login_ldap/patches/patch-login_ldap_conf b/sysutils/login_ldap/patches/patch-login_ldap_conf
deleted file mode 100644
index bfbc16cfb18..00000000000
--- a/sysutils/login_ldap/patches/patch-login_ldap_conf
+++ /dev/null
@@ -1,9 +0,0 @@
-$OpenBSD: patch-login_ldap_conf,v 1.1 2007/08/29 13:21:05 jasper Exp $
---- login_ldap.conf.orig	Wed Aug 29 15:19:18 2007
-+++ login_ldap.conf	Wed Aug 29 15:19:43 2007
-@@ -12,4 +12,4 @@ ldap:\
- 	:x-ldap-filter=(&(objectclass=posixAccount)(uid=%u)):\
- 	:x-ldap-gscope=base:\
- 	:x-ldap-groupdn=cn=accessgroup,ou=Groups,dc=example,dc=com:\
--	:x-ldap-groupfilter=(|(&(objectClass=posixGroup)(memberUid=%u))(&(objeclass=groupOfUniqueNames)(uniqueMember=%d))):
-+	:x-ldap-groupfilter=(|(&(objectClass=posixGroup)(memberUid=%u))(&(objectClass=groupOfUniqueNames)(uniqueMember=%d))):
diff --git a/sysutils/login_ldap/pkg/DESCR b/sysutils/login_ldap/pkg/DESCR
index 59a8d2edae0..a6299b2353a 100644
--- a/sysutils/login_ldap/pkg/DESCR
+++ b/sysutils/login_ldap/pkg/DESCR
@@ -1,4 +1,2 @@
-This port is for OpenBSD administrators wanting to authenticate
-users off an LDAP server. It uses the BSD Authentication API.
-
-Please visit WWW for information on updates and commercial support.
+login_ldap provides an authentication mechanism through bsdauth to
+authenticate users against an LDAP server.
diff --git a/sysutils/login_ldap/pkg/PLIST b/sysutils/login_ldap/pkg/PLIST
index a2701c95d15..0da66372e8a 100644
--- a/sysutils/login_ldap/pkg/PLIST
+++ b/sysutils/login_ldap/pkg/PLIST
@@ -1,15 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.6 2005/10/01 17:12:30 espie Exp $
-bin/enable-login_ldap
+@comment $OpenBSD: PLIST,v 1.7 2008/02/14 16:19:49 merdely Exp $
 libexec/auth/
 @group auth
 libexec/auth/login_-ldap
 @mode 0555
 @owner root
 @sample /usr/libexec/auth/login_-ldap
+@mode
 @owner
 @group
-@mode
 @man man/cat8/login_ldap.0
-share/login_ldap/
-share/login_ldap/active-directory.login_ldap.conf
-share/login_ldap/login_ldap.conf
+share/examples/login_ldap/
+share/examples/login_ldap/active-directory.login_ldap.conf
+share/examples/login_ldap/login_ldap.conf