diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 8770f347af8e..ceb90325c012 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	zenmap
-PORTVERSION=	6.25
-PORTREVISION=	1
+PORTVERSION=	6.40
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://nmap.org/dist/
 DISTNAME=	nmap-${PORTVERSION}
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	GUI frontend for the Nmap scanning utility
 
 LICENSE=	GPLv2
@@ -19,24 +18,22 @@ RUN_DEPENDS=	${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap \
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
 USE_BZIP2=	yes
+USES=		desktop-file-utils
 USE_GNOME=	pygtk2
-USE_PYTHON=	-2.7
-USE_PYDISTUTILS=yes
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 
 MLINKS=	zenmap.1 xnmap.1
 MAN1=	zenmap.1 ndiff.1
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 post-extract:
 	@${RM} -f ${WRKSRC}/install_scripts/unix/su-to-zenmap.sh
 	@${CP} -a ${FILESDIR}/pc-su ${WRKSRC}/install_scripts/unix/su-to-zenmap.sh
diff --git a/security/zenmap/distinfo b/security/zenmap/distinfo
index d8a65768cb67..ddd665d6dada 100644
--- a/security/zenmap/distinfo
+++ b/security/zenmap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nmap-6.25.tar.bz2) = 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5
-SIZE (nmap-6.25.tar.bz2) = 7668639
+SHA256 (nmap-6.40.tar.bz2) = 491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401
+SIZE (nmap-6.40.tar.bz2) = 7871636
diff --git a/security/zenmap/files/pc-su b/security/zenmap/files/pc-su
index ceccaace603c..87c6ea74a21b 100644
--- a/security/zenmap/files/pc-su
+++ b/security/zenmap/files/pc-su
@@ -5,10 +5,10 @@
 if [ `id -r -u` != "0" ] ; then
         VARS="`echo $@`"
 
-        # Try qsu first, should always be the default
-        which qsu >/dev/null 2>/dev/null
+        # Try qsudo first, should always be the default
+        which qsudo >/dev/null 2>/dev/null
         if [ $? -eq 0 ] ; then
-           qsu $VARS
+           qsudo $VARS
            exit $?
         fi
 
diff --git a/security/zenmap/pkg-plist b/security/zenmap/pkg-plist
index 1f397f40f7de..617339d391c6 100644
--- a/security/zenmap/pkg-plist
+++ b/security/zenmap/pkg-plist
@@ -315,8 +315,8 @@ bin/zenmap
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/utils.py
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/utils.pyc
 %%PYTHON_SITELIBDIR%%/zenmapGUI/higwidgets/utils.pyo
-share/applications/zenmap.desktop
 share/applications/zenmap-root.desktop
+share/applications/zenmap.desktop
 %%DATADIR%%/config/scan_profile.usp
 %%DATADIR%%/config/zenmap.conf
 %%DATADIR%%/config/zenmap_version
@@ -326,6 +326,7 @@ share/applications/zenmap-root.desktop
 %%NLS%%%%DATADIR%%/locale/hr/LC_MESSAGES/zenmap.mo
 %%NLS%%%%DATADIR%%/locale/it/LC_MESSAGES/zenmap.mo
 %%NLS%%%%DATADIR%%/locale/ja/LC_MESSAGES/zenmap.mo
+%%NLS%%%%DATADIR%%/locale/pl/LC_MESSAGES/zenmap.mo
 %%NLS%%%%DATADIR%%/locale/pt_BR/LC_MESSAGES/zenmap.mo
 %%NLS%%%%DATADIR%%/locale/ru/LC_MESSAGES/zenmap.mo
 %%DATADIR%%/misc/profile_editor.xml
@@ -379,6 +380,8 @@ share/applications/zenmap-root.desktop
 %%NLS%%@dirrm %%DATADIR%%/locale/ru
 %%NLS%%@dirrm %%DATADIR%%/locale/pt_BR/LC_MESSAGES
 %%NLS%%@dirrm %%DATADIR%%/locale/pt_BR
+%%NLS%%@dirrm %%DATADIR%%/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm %%DATADIR%%/locale/pl
 %%NLS%%@dirrm %%DATADIR%%/locale/ja/LC_MESSAGES
 %%NLS%%@dirrm %%DATADIR%%/locale/ja
 %%NLS%%@dirrm %%DATADIR%%/locale/it/LC_MESSAGES