diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index f0a599c76828..30d4c6bdf0c3 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	1.5.1.1
 PORTEPOCH=	1
 CATEGORIES=	net print
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	netatalk
 
 MAINTAINER=	marcus@marcuscom.com
@@ -25,7 +24,6 @@ LIB_DEPENDS=	slp.1:${PORTSDIR}/net/openslp
 LIB_DEPENDS+=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
-USE_BZIP2=	yes
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-pkgconfdir=${PREFIX}/etc \
 #			--disable-ddp
@@ -52,10 +50,12 @@ CONFIGURE_ARGS+=		--with-flock-locks
 # This has been tested on MacOS 9.2.x and OS X.
 CONFIGURE_ARGS+=		--with-did=cnid \
 						--with-db3=/usr/local
+PLIST_SUB+=				NETATALKCNID=""
 .else
 # This method of DID calculation is not persistent, but has been tested to
 # work with MacOS X (10.0.3-10.1.1) as well as MacOS 7-9.2.2.
 CONFIGURE_ARGS+=		--with-did=last
+PLIST_SUB+=             NETATALKCNID="@comment "
 .endif
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/net/netatalk-devel/distinfo b/net/netatalk-devel/distinfo
index 81d73163ea5f..ea2a1999cf65 100644
--- a/net/netatalk-devel/distinfo
+++ b/net/netatalk-devel/distinfo
@@ -1 +1 @@
-MD5 (netatalk-1.5.0.tar.bz2) = d6609e86f39f8f0a7ab84c001a193848
+MD5 (netatalk-1.5.1.1.tar.gz) = 8922f0ba49bcc1274f760b3a406e2fcc
diff --git a/net/netatalk-devel/files/patch-configure b/net/netatalk-devel/files/patch-configure
index 6c68a480848d..f50ca2940735 100644
--- a/net/netatalk-devel/files/patch-configure
+++ b/net/netatalk-devel/files/patch-configure
@@ -1,13 +1,13 @@
---- configure.orig	Mon Jan  7 11:00:12 2002
-+++ configure	Mon Jan  7 11:00:34 2002
-@@ -8249,14 +8249,14 @@
+--- configure.orig	Sat Jan 26 16:25:38 2002
++++ configure	Sat Jan 26 16:25:51 2002
+@@ -8250,14 +8250,14 @@
  			savedldflags="$LDFLAGS"
  			CFLAGS="$CFLAGS -I$db3dir"
  			LDFLAGS="-L$db3libdir $LDFLAGS"
 -			echo $ac_n "checking for main in -ldb""... $ac_c" 1>&6
--echo "configure:8254: checking for main in -ldb" >&5
+-echo "configure:8255: checking for main in -ldb" >&5
 +			echo $ac_n "checking for main in -ldb3""... $ac_c" 1>&6
-+echo "configure:8254: checking for main in -ldb3" >&5
++echo "configure:8255: checking for main in -ldb3" >&5
  ac_lib_var=`echo db'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -16,9 +16,9 @@
 -LIBS="-ldb  $LIBS"
 +LIBS="-ldb3  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 8262 "configure"
+ #line 8263 "configure"
  #include "confdefs.h"
-@@ -8283,7 +8283,7 @@
+@@ -8284,7 +8284,7 @@
    
  				db3found=yes
  				DB3_CFLAGS="-I$db3dir"
diff --git a/net/netatalk-devel/files/patch-ltmain.sh b/net/netatalk-devel/files/patch-ltmain.sh
new file mode 100644
index 000000000000..2ac052749556
--- /dev/null
+++ b/net/netatalk-devel/files/patch-ltmain.sh
@@ -0,0 +1,25 @@
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/netatalk-devel/files/patch-macusers b/net/netatalk-devel/files/patch-macusers
deleted file mode 100644
index 763e5ec339af..000000000000
--- a/net/netatalk-devel/files/patch-macusers
+++ /dev/null
@@ -1,54 +0,0 @@
---- contrib/macusers/macusers.orig	Wed Aug 29 12:20:32 2001
-+++ contrib/macusers/macusers	Sun Jun 17 01:47:44 2001
-@@ -1,8 +1,8 @@
- #!/usr/bin/perl
--# $Id: macusers,v 1.4 2001/06/29 14:14:46 rufustfirefly Exp $
- 
- use strict;
--use vars qw($MAC_PROCESS $PS_STR $MATCH_STR $ASIP_PORT $LSOF);
-+use Socket;
-+use vars qw($MAC_PROCESS $PS_STR $MATCH_STR $ASIP_PORT_NO $ASIP_PORT $LSOF);
- 
- # Written for linux; may have to be modified for your brand of Unix.
- 
-@@ -25,10 +25,11 @@
-         $PS_STR    = "-ef";
-         $MATCH_STR = '\s*(\w+)\s+(\d+)\s+(\d+)\s+\d+\s+([\d\w:]+)';
- }
--$ASIP_PORT = "afpovertcp";
-+$ASIP_PORT    = "afpovertcp";
-+$ASIP_PORT_NO = 548;
- 
- # Change to 0 if you don't have lsof
--$LSOF = 1;
-+$LSOF = 0;
- my %mac = ();
- 
- if ( $LSOF == 1 ) {
-@@ -43,8 +44,25 @@
-                 ($host) = ( $host =~ /(^[\w\d\-]+)/ );
-                 $mac{$pid} = $host;
-         }
--
-+        print
-+"PID      UID      Username         Name                 Logintime Mac\n";
-         close(LSOF);
-+}
-+elsif ( $^O eq "freebsd" ) {
-+        open( SOCKSTAT, "sockstat -4 | grep $MAC_PROCESS | grep -v grep |" );
-+
-+        while (<SOCKSTAT>) {
-+                next if ( $_ !~ /$MAC_PROCESS/ );
-+                $_ =~
-+                  /\S+\s+\S+\s+(\d+)\s+\d+\s+[\w\d]+\s+[\d\.:]+\s+([\d\.]+)/;
-+                my ( $pid, $addr, $host );
-+                $pid  = $1;
-+                $addr = $2;
-+                $host =
-+                  gethostbyaddr( pack( 'C4', split ( /\./, $addr ) ), AF_INET );
-+                ($host) = ( $host =~ /(^[\w\d\-]+)/ );
-+                $mac{$pid} = $host;
-+        }
-         print
- "PID      UID      Username         Name                 Logintime Mac\n";
- }
diff --git a/net/netatalk-devel/pkg-plist b/net/netatalk-devel/pkg-plist
index 45a10ce34894..6bd78d5fa80f 100644
--- a/net/netatalk-devel/pkg-plist
+++ b/net/netatalk-devel/pkg-plist
@@ -28,6 +28,7 @@ bin/megatron
 @exec cd %B && ln -s megatron macbinary
 @exec cd %B && ln -s megatron binheader
 @exec cd %B && ln -s megatron nadheader
+%%NETATALKCNID%%bin/cnid_didname_verify
 bin/nbplkup
 bin/nbprgstr
 bin/nbpunrgstr
@@ -87,22 +88,16 @@ etc/uams/uams_clrtxt.so
 etc/uams/uams_dhx.so
 %%NETATALKPAM%%etc/uams/uams_dhx_pam.so
 %%NETATALKPAM%%etc/uams/uams_dhx_pam.a
-%%NETATALKPAM%%etc/uams/uams_dhx_pam.la
 etc/uams/uams_dhx_passwd.so
 etc/uams/uams_dhx_passwd.a
-etc/uams/uams_dhx_passwd.la
 etc/uams/uams_guest.so
 etc/uams/uams_guest.a
-etc/uams/uams_guest.la
 %%NETATALKPAM%%etc/uams/uams_pam.so
 %%NETATALKPAM%%etc/uams/uams_pam.a
-%%NETATALKPAM%%etc/uams/uams_pam.la
 etc/uams/uams_passwd.so
 etc/uams/uams_passwd.a
-etc/uams/uams_passwd.la
 etc/uams/uams_randnum.so
 etc/uams/uams_randnum.a
-etc/uams/uams_randnum.la
 @dirrm etc/nls
 @dirrm etc/uams
 include/atalk/adouble.h
@@ -139,7 +134,6 @@ include/netatalk/phase2.h
 @dirrm include/atalk
 @dirrm include/netatalk
 lib/libatalk.a
-lib/libatalk.la
 share/aclocal/netatalk.m4
 share/netatalk/pagecount.ps
 @dirrm share/netatalk
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index f0a599c76828..30d4c6bdf0c3 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	1.5.1.1
 PORTEPOCH=	1
 CATEGORIES=	net print
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	netatalk
 
 MAINTAINER=	marcus@marcuscom.com
@@ -25,7 +24,6 @@ LIB_DEPENDS=	slp.1:${PORTSDIR}/net/openslp
 LIB_DEPENDS+=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
-USE_BZIP2=	yes
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-pkgconfdir=${PREFIX}/etc \
 #			--disable-ddp
@@ -52,10 +50,12 @@ CONFIGURE_ARGS+=		--with-flock-locks
 # This has been tested on MacOS 9.2.x and OS X.
 CONFIGURE_ARGS+=		--with-did=cnid \
 						--with-db3=/usr/local
+PLIST_SUB+=				NETATALKCNID=""
 .else
 # This method of DID calculation is not persistent, but has been tested to
 # work with MacOS X (10.0.3-10.1.1) as well as MacOS 7-9.2.2.
 CONFIGURE_ARGS+=		--with-did=last
+PLIST_SUB+=             NETATALKCNID="@comment "
 .endif
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 81d73163ea5f..ea2a1999cf65 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1 +1 @@
-MD5 (netatalk-1.5.0.tar.bz2) = d6609e86f39f8f0a7ab84c001a193848
+MD5 (netatalk-1.5.1.1.tar.gz) = 8922f0ba49bcc1274f760b3a406e2fcc
diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure
index 6c68a480848d..f50ca2940735 100644
--- a/net/netatalk/files/patch-configure
+++ b/net/netatalk/files/patch-configure
@@ -1,13 +1,13 @@
---- configure.orig	Mon Jan  7 11:00:12 2002
-+++ configure	Mon Jan  7 11:00:34 2002
-@@ -8249,14 +8249,14 @@
+--- configure.orig	Sat Jan 26 16:25:38 2002
++++ configure	Sat Jan 26 16:25:51 2002
+@@ -8250,14 +8250,14 @@
  			savedldflags="$LDFLAGS"
  			CFLAGS="$CFLAGS -I$db3dir"
  			LDFLAGS="-L$db3libdir $LDFLAGS"
 -			echo $ac_n "checking for main in -ldb""... $ac_c" 1>&6
--echo "configure:8254: checking for main in -ldb" >&5
+-echo "configure:8255: checking for main in -ldb" >&5
 +			echo $ac_n "checking for main in -ldb3""... $ac_c" 1>&6
-+echo "configure:8254: checking for main in -ldb3" >&5
++echo "configure:8255: checking for main in -ldb3" >&5
  ac_lib_var=`echo db'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -16,9 +16,9 @@
 -LIBS="-ldb  $LIBS"
 +LIBS="-ldb3  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 8262 "configure"
+ #line 8263 "configure"
  #include "confdefs.h"
-@@ -8283,7 +8283,7 @@
+@@ -8284,7 +8284,7 @@
    
  				db3found=yes
  				DB3_CFLAGS="-I$db3dir"
diff --git a/net/netatalk/files/patch-ltmain.sh b/net/netatalk/files/patch-ltmain.sh
new file mode 100644
index 000000000000..2ac052749556
--- /dev/null
+++ b/net/netatalk/files/patch-ltmain.sh
@@ -0,0 +1,25 @@
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/netatalk/files/patch-macusers b/net/netatalk/files/patch-macusers
deleted file mode 100644
index 763e5ec339af..000000000000
--- a/net/netatalk/files/patch-macusers
+++ /dev/null
@@ -1,54 +0,0 @@
---- contrib/macusers/macusers.orig	Wed Aug 29 12:20:32 2001
-+++ contrib/macusers/macusers	Sun Jun 17 01:47:44 2001
-@@ -1,8 +1,8 @@
- #!/usr/bin/perl
--# $Id: macusers,v 1.4 2001/06/29 14:14:46 rufustfirefly Exp $
- 
- use strict;
--use vars qw($MAC_PROCESS $PS_STR $MATCH_STR $ASIP_PORT $LSOF);
-+use Socket;
-+use vars qw($MAC_PROCESS $PS_STR $MATCH_STR $ASIP_PORT_NO $ASIP_PORT $LSOF);
- 
- # Written for linux; may have to be modified for your brand of Unix.
- 
-@@ -25,10 +25,11 @@
-         $PS_STR    = "-ef";
-         $MATCH_STR = '\s*(\w+)\s+(\d+)\s+(\d+)\s+\d+\s+([\d\w:]+)';
- }
--$ASIP_PORT = "afpovertcp";
-+$ASIP_PORT    = "afpovertcp";
-+$ASIP_PORT_NO = 548;
- 
- # Change to 0 if you don't have lsof
--$LSOF = 1;
-+$LSOF = 0;
- my %mac = ();
- 
- if ( $LSOF == 1 ) {
-@@ -43,8 +44,25 @@
-                 ($host) = ( $host =~ /(^[\w\d\-]+)/ );
-                 $mac{$pid} = $host;
-         }
--
-+        print
-+"PID      UID      Username         Name                 Logintime Mac\n";
-         close(LSOF);
-+}
-+elsif ( $^O eq "freebsd" ) {
-+        open( SOCKSTAT, "sockstat -4 | grep $MAC_PROCESS | grep -v grep |" );
-+
-+        while (<SOCKSTAT>) {
-+                next if ( $_ !~ /$MAC_PROCESS/ );
-+                $_ =~
-+                  /\S+\s+\S+\s+(\d+)\s+\d+\s+[\w\d]+\s+[\d\.:]+\s+([\d\.]+)/;
-+                my ( $pid, $addr, $host );
-+                $pid  = $1;
-+                $addr = $2;
-+                $host =
-+                  gethostbyaddr( pack( 'C4', split ( /\./, $addr ) ), AF_INET );
-+                ($host) = ( $host =~ /(^[\w\d\-]+)/ );
-+                $mac{$pid} = $host;
-+        }
-         print
- "PID      UID      Username         Name                 Logintime Mac\n";
- }
diff --git a/net/netatalk/pkg-plist b/net/netatalk/pkg-plist
index 45a10ce34894..6bd78d5fa80f 100644
--- a/net/netatalk/pkg-plist
+++ b/net/netatalk/pkg-plist
@@ -28,6 +28,7 @@ bin/megatron
 @exec cd %B && ln -s megatron macbinary
 @exec cd %B && ln -s megatron binheader
 @exec cd %B && ln -s megatron nadheader
+%%NETATALKCNID%%bin/cnid_didname_verify
 bin/nbplkup
 bin/nbprgstr
 bin/nbpunrgstr
@@ -87,22 +88,16 @@ etc/uams/uams_clrtxt.so
 etc/uams/uams_dhx.so
 %%NETATALKPAM%%etc/uams/uams_dhx_pam.so
 %%NETATALKPAM%%etc/uams/uams_dhx_pam.a
-%%NETATALKPAM%%etc/uams/uams_dhx_pam.la
 etc/uams/uams_dhx_passwd.so
 etc/uams/uams_dhx_passwd.a
-etc/uams/uams_dhx_passwd.la
 etc/uams/uams_guest.so
 etc/uams/uams_guest.a
-etc/uams/uams_guest.la
 %%NETATALKPAM%%etc/uams/uams_pam.so
 %%NETATALKPAM%%etc/uams/uams_pam.a
-%%NETATALKPAM%%etc/uams/uams_pam.la
 etc/uams/uams_passwd.so
 etc/uams/uams_passwd.a
-etc/uams/uams_passwd.la
 etc/uams/uams_randnum.so
 etc/uams/uams_randnum.a
-etc/uams/uams_randnum.la
 @dirrm etc/nls
 @dirrm etc/uams
 include/atalk/adouble.h
@@ -139,7 +134,6 @@ include/netatalk/phase2.h
 @dirrm include/atalk
 @dirrm include/netatalk
 lib/libatalk.a
-lib/libatalk.la
 share/aclocal/netatalk.m4
 share/netatalk/pagecount.ps
 @dirrm share/netatalk