diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 871554823fd5..a642273f1bf7 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	2.1.3
-PORTREVISION=	2
+PORTVERSION=	2.1.4
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	SF
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 7630f6ddc6a0..40426c0fee9e 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,3 +1,2 @@
-MD5 (netatalk-2.1.3.tar.bz2) = 5916e70ca6fd16748d8c62a2c41114ca
-SHA256 (netatalk-2.1.3.tar.bz2) = 472f283c495c6c39020eeedea0b71610aa10008812f491a80617555f999216b4
-SIZE (netatalk-2.1.3.tar.bz2) = 1122920
+SHA256 (netatalk-2.1.4.tar.bz2) = b00ac9ff638805ac320140be17280dfa3f9ce8b3442960e8e906531a5f3d96f9
+SIZE (netatalk-2.1.4.tar.bz2) = 1123981
diff --git a/net/netatalk/files/patch-config_Makefile.in b/net/netatalk/files/patch-config_Makefile.in
index 4ae72a138d55..98a0c083682f 100644
--- a/net/netatalk/files/patch-config_Makefile.in
+++ b/net/netatalk/files/patch-config_Makefile.in
@@ -1,6 +1,6 @@
---- config/Makefile.in.orig	2010-04-22 07:59:53.000000000 +0000
-+++ config/Makefile.in	2010-05-20 20:21:51.000000000 +0000
-@@ -590,19 +590,15 @@
+--- config/Makefile.in.orig	2010-10-15 06:10:05.000000000 -0400
++++ config/Makefile.in	2010-11-07 18:38:03.000000000 -0500
+@@ -592,8 +592,8 @@ install-data-local: install-config-files
  
  uninstall-local:
  	for f in $(CONFFILES) $(GENFILES); do \
@@ -10,6 +10,8 @@
 +		rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
  	done
  
+ @USE_DEBIAN_TRUE@	rm -f $(DESTDIR)/etc/default/netatalk;
+@@ -601,12 +601,8 @@ uninstall-local:
  install-config-files: $(CONFFILES) $(GENFILES)
  	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
  	for f in $(CONFFILES) $(GENFILES); do \
@@ -19,8 +21,8 @@
 -		else \
 -			echo "not overwriting $$f"; \
 -		fi; \
-+		echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \
-+		$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
++	    echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \
++	    $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
  	done
  
- install-webmin:
+ @USE_DEBIAN_TRUE@	$(mkinstalldirs) $(DESTDIR)/default
diff --git a/net/netatalk/files/patch-libatalk_dsi_dsi_tcp.c b/net/netatalk/files/patch-libatalk_dsi_dsi_tcp.c
deleted file mode 100644
index 894e9e164463..000000000000
--- a/net/netatalk/files/patch-libatalk_dsi_dsi_tcp.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- libatalk/dsi/dsi_tcp.c.orig	2010-07-02 10:48:44.000000000 -0400
-+++ libatalk/dsi/dsi_tcp.c	2010-08-15 17:49:41.000000000 -0400
-@@ -277,19 +277,22 @@ int dsi_tcp_init(DSI *dsi, const char *h
- {
-     int                ret;
-     int                flag;
-+    int                on;
-     struct addrinfo    hints, *servinfo, *p;
- 
-     dsi->protocol = DSI_TCPIP;
- 
-     /* Prepare hint for getaddrinfo */
-     memset(&hints, 0, sizeof hints);
--    hints.ai_family = AF_UNSPEC;
-     hints.ai_socktype = SOCK_STREAM;
-     hints.ai_flags = AI_NUMERICSERV;
--    if ( ! address)
-+    if ( ! address) {
-         hints.ai_flags |= AI_PASSIVE;
--    else
-+	hints.ai_family = AF_INET6;
-+    } else {
-         hints.ai_flags |= AI_NUMERICHOST;
-+	hints.ai_family = AF_UNSPEC;
-+    }
- 
-     if ((ret = getaddrinfo(address ? address : NULL, port ? port : "548", &hints, &servinfo)) != 0) {
-         LOG(log_error, logtype_dsi, "dsi_tcp_init: getaddrinfo: %s\n", gai_strerror(ret));
-@@ -316,6 +319,10 @@ int dsi_tcp_init(DSI *dsi, const char *h
-             flag = 1;
-             setsockopt(dsi->serversock, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag));
- #endif
-+#ifdef IPV6_BINDV6ONLY
-+	    on = 0;
-+	    setsockopt(dsi->serversock, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof (on));
-+#endif
- 
- #ifdef USE_TCP_NODELAY
- #ifndef SOL_TCP