diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 56b1e710c1a2..1dc69ad6a68b 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	enlightenment
-PORTVERSION=	0.16.8.11
-PORTREVISION=	0
+PORTVERSION=	0.16.8.12
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -39,26 +38,10 @@ CONFIGURE_ARGS+=--disable-sound
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-PLIST_FILES=	share/locale/bg/LC_MESSAGES/e16.mo \
-		share/locale/bs/LC_MESSAGES/e16.mo \
-		share/locale/da/LC_MESSAGES/e16.mo \
-		share/locale/de/LC_MESSAGES/e16.mo \
-		share/locale/en_US/LC_MESSAGES/e16.mo \
-		share/locale/es/LC_MESSAGES/e16.mo \
-		share/locale/fr/LC_MESSAGES/e16.mo \
-		share/locale/hu/LC_MESSAGES/e16.mo \
-		share/locale/ja/LC_MESSAGES/e16.mo \
-		share/locale/ko/LC_MESSAGES/e16.mo \
-		share/locale/nl/LC_MESSAGES/e16.mo \
-		share/locale/no/LC_MESSAGES/e16.mo \
-		share/locale/pl/LC_MESSAGES/e16.mo \
-		share/locale/pt/LC_MESSAGES/e16.mo \
-		share/locale/pt_BR/LC_MESSAGES/e16.mo \
-		share/locale/ru/LC_MESSAGES/e16.mo \
-		share/locale/sv/LC_MESSAGES/e16.mo \
-		share/locale/tr/LC_MESSAGES/e16.mo
+PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e16/distinfo b/x11-wm/e16/distinfo
index c3ba173a1724..04ea926bac88 100644
--- a/x11-wm/e16/distinfo
+++ b/x11-wm/e16/distinfo
@@ -1,3 +1,3 @@
-MD5 (e16-0.16.8.11-0.01.tar.gz) = f27227e1d9216b7c80f2d34a243f43ec
-SHA256 (e16-0.16.8.11-0.01.tar.gz) = 1f601781788eaaa1a53bfce85fc0ed9d9ee732b588889419305e4121578ea849
-SIZE (e16-0.16.8.11-0.01.tar.gz) = 1955291
+MD5 (e16-0.16.8.12-0.01.tar.gz) = a10a720f167939ab1a8810885b77dd8b
+SHA256 (e16-0.16.8.12-0.01.tar.gz) = a5a8d2bfbfcdd3ce0011ba29244f01767c062ed8f9ab02ba22a0e092c6397f62
+SIZE (e16-0.16.8.12-0.01.tar.gz) = 1950838
diff --git a/x11-wm/e16/pkg-plist b/x11-wm/e16/pkg-plist
index 1e6a3f5d8909..0f1bb26e9ca4 100644
--- a/x11-wm/e16/pkg-plist
+++ b/x11-wm/e16/pkg-plist
@@ -3,6 +3,24 @@ bin/edox
 bin/eesh
 bin/epp
 bin/starte16
+%%NLS%%share/locale/bg/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/da/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/de/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/en_US/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/es/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/no/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/e16.mo
 %%DATADIR%%/E-docs/exit1.png
 %%DATADIR%%/E-docs/exit2.png
 %%DATADIR%%/E-docs/next1.png
@@ -93,7 +111,6 @@ bin/starte16
 %%DATADIR%%/scripts/session.sh
 %%DATADIR%%/themes/winter/ABOUT/MAIN
 %%DATADIR%%/themes/winter/ABOUT/bg.png
-%%DATADIR%%/themes/winter/ABOUT/vixar.ttf
 %%DATADIR%%/themes/winter/README
 %%DATADIR%%/themes/winter/backgrounds/backgrounds.cfg
 %%DATADIR%%/themes/winter/backgrounds/images/startup-bg.png
@@ -375,7 +392,6 @@ bin/starte16
 %%DATADIR%%/themes/winter/tooltips/images/tooltipbg.png
 %%DATADIR%%/themes/winter/tooltips/tooltips.cfg
 %%DATADIR%%/themes/winter/ttfonts/COPYRIGHT.Vera
-%%DATADIR%%/themes/winter/ttfonts/LICENSE.Vera
 %%DATADIR%%/themes/winter/ttfonts/Vera.ttf
 %%DATADIR%%/themes/winter/ttfonts/VeraBd.ttf
 share/xsessions/e16.desktop
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 56b1e710c1a2..1dc69ad6a68b 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	enlightenment
-PORTVERSION=	0.16.8.11
-PORTREVISION=	0
+PORTVERSION=	0.16.8.12
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -39,26 +38,10 @@ CONFIGURE_ARGS+=--disable-sound
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-PLIST_FILES=	share/locale/bg/LC_MESSAGES/e16.mo \
-		share/locale/bs/LC_MESSAGES/e16.mo \
-		share/locale/da/LC_MESSAGES/e16.mo \
-		share/locale/de/LC_MESSAGES/e16.mo \
-		share/locale/en_US/LC_MESSAGES/e16.mo \
-		share/locale/es/LC_MESSAGES/e16.mo \
-		share/locale/fr/LC_MESSAGES/e16.mo \
-		share/locale/hu/LC_MESSAGES/e16.mo \
-		share/locale/ja/LC_MESSAGES/e16.mo \
-		share/locale/ko/LC_MESSAGES/e16.mo \
-		share/locale/nl/LC_MESSAGES/e16.mo \
-		share/locale/no/LC_MESSAGES/e16.mo \
-		share/locale/pl/LC_MESSAGES/e16.mo \
-		share/locale/pt/LC_MESSAGES/e16.mo \
-		share/locale/pt_BR/LC_MESSAGES/e16.mo \
-		share/locale/ru/LC_MESSAGES/e16.mo \
-		share/locale/sv/LC_MESSAGES/e16.mo \
-		share/locale/tr/LC_MESSAGES/e16.mo
+PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/enlightenment/distinfo b/x11-wm/enlightenment/distinfo
index c3ba173a1724..04ea926bac88 100644
--- a/x11-wm/enlightenment/distinfo
+++ b/x11-wm/enlightenment/distinfo
@@ -1,3 +1,3 @@
-MD5 (e16-0.16.8.11-0.01.tar.gz) = f27227e1d9216b7c80f2d34a243f43ec
-SHA256 (e16-0.16.8.11-0.01.tar.gz) = 1f601781788eaaa1a53bfce85fc0ed9d9ee732b588889419305e4121578ea849
-SIZE (e16-0.16.8.11-0.01.tar.gz) = 1955291
+MD5 (e16-0.16.8.12-0.01.tar.gz) = a10a720f167939ab1a8810885b77dd8b
+SHA256 (e16-0.16.8.12-0.01.tar.gz) = a5a8d2bfbfcdd3ce0011ba29244f01767c062ed8f9ab02ba22a0e092c6397f62
+SIZE (e16-0.16.8.12-0.01.tar.gz) = 1950838
diff --git a/x11-wm/enlightenment/pkg-plist b/x11-wm/enlightenment/pkg-plist
index 1e6a3f5d8909..0f1bb26e9ca4 100644
--- a/x11-wm/enlightenment/pkg-plist
+++ b/x11-wm/enlightenment/pkg-plist
@@ -3,6 +3,24 @@ bin/edox
 bin/eesh
 bin/epp
 bin/starte16
+%%NLS%%share/locale/bg/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/da/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/de/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/en_US/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/es/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/no/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/e16.mo
 %%DATADIR%%/E-docs/exit1.png
 %%DATADIR%%/E-docs/exit2.png
 %%DATADIR%%/E-docs/next1.png
@@ -93,7 +111,6 @@ bin/starte16
 %%DATADIR%%/scripts/session.sh
 %%DATADIR%%/themes/winter/ABOUT/MAIN
 %%DATADIR%%/themes/winter/ABOUT/bg.png
-%%DATADIR%%/themes/winter/ABOUT/vixar.ttf
 %%DATADIR%%/themes/winter/README
 %%DATADIR%%/themes/winter/backgrounds/backgrounds.cfg
 %%DATADIR%%/themes/winter/backgrounds/images/startup-bg.png
@@ -375,7 +392,6 @@ bin/starte16
 %%DATADIR%%/themes/winter/tooltips/images/tooltipbg.png
 %%DATADIR%%/themes/winter/tooltips/tooltips.cfg
 %%DATADIR%%/themes/winter/ttfonts/COPYRIGHT.Vera
-%%DATADIR%%/themes/winter/ttfonts/LICENSE.Vera
 %%DATADIR%%/themes/winter/ttfonts/Vera.ttf
 %%DATADIR%%/themes/winter/ttfonts/VeraBd.ttf
 share/xsessions/e16.desktop