diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index beb354632b70..0844f421cf18 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	gif:${PORTSDIR}/graphics/giflib \
 .if !defined(LWR_SLAVE)
 RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
 USE_PERL5=	yes
-OPTIONS_DEFINE=	XRANDR
+OPTIONS_DEFINE=	NLS XRANDR
 .endif
 
 MAKE_JOBS_SAFE=	yes
@@ -28,7 +28,6 @@ MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
 USE_XORG=	xft xinerama xmu xpm
-USE_GETTEXT=	yes
 USE_PKGCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -55,6 +54,16 @@ CONFIGURE_ENV+=	ac_cv_c_inline_asm=no
 BROKEN=		does not compile on FreeBSD 7.X
 .endif
 
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=   yes
+LINGUAS=	be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW
+CONFIGURE_ENV+=	LINGUAS="${LINGUAS}"
+PLIST_SUB=     NLS=""
+.else
+CONFIGURE_ARGS+=       --disable-locale
+PLIST_SUB=     NLS="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MXRANDR}
 USE_XORG+=	xrandr
 CONFIGURE_ARGS+=	--enable-xrandr
@@ -82,9 +91,6 @@ MAN1_RU=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
 PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \
 		INSTALL-WMAKER NEWS README README.definable-cursor TODO
 
-LINGUAS=	be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW
-CONFIGURE_ENV+=	LINGUAS="${LINGUAS}"
-
 post-patch:
 .for f in WINGs/wapplication.c WPrefs.app/Menu.c WPrefs.app/Paths.c \
     WindowMaker/*menu*
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index f5cb6b75e33a..9dd51a7d2604 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -290,65 +290,65 @@ share/WindowMaker/plmenu.sk
 share/WindowMaker/plmenu.zh_CN
 share/WindowMaker/plmenu.zh_TW
 share/WindowMaker/wmmacros
-share/locale/be/LC_MESSAGES/WindowMaker.mo
-share/locale/bg/LC_MESSAGES/WINGs.mo
-share/locale/bg/LC_MESSAGES/WPrefs.mo
-share/locale/bg/LC_MESSAGES/WindowMaker.mo
-share/locale/bs/LC_MESSAGES/WindowMaker.mo
-share/locale/ca/LC_MESSAGES/WINGs.mo
-share/locale/ca/LC_MESSAGES/WPrefs.mo
-share/locale/ca/LC_MESSAGES/WindowMaker.mo
-share/locale/cs/LC_MESSAGES/WINGs.mo
-share/locale/cs/LC_MESSAGES/WPrefs.mo
-share/locale/cs/LC_MESSAGES/WindowMaker.mo
-share/locale/da/LC_MESSAGES/WindowMaker.mo
-share/locale/de/LC_MESSAGES/WINGs.mo
-share/locale/de/LC_MESSAGES/WPrefs.mo
-share/locale/de/LC_MESSAGES/WindowMaker.mo
-share/locale/de/LC_MESSAGES/wmgenmenu.mo
-share/locale/el/LC_MESSAGES/WindowMaker.mo
-share/locale/es/LC_MESSAGES/WPrefs.mo
-share/locale/es/LC_MESSAGES/WindowMaker.mo
-share/locale/es/LC_MESSAGES/wmgenmenu.mo
-share/locale/et/LC_MESSAGES/WPrefs.mo
-share/locale/et/LC_MESSAGES/WindowMaker.mo
-share/locale/fi/LC_MESSAGES/WPrefs.mo
-share/locale/fi/LC_MESSAGES/WindowMaker.mo
-share/locale/fr/LC_MESSAGES/WINGs.mo
-share/locale/fr/LC_MESSAGES/WPrefs.mo
-share/locale/fr/LC_MESSAGES/WindowMaker.mo
-share/locale/fr/LC_MESSAGES/wmgenmenu.mo
-share/locale/gl/LC_MESSAGES/WindowMaker.mo
-share/locale/hr/LC_MESSAGES/WPrefs.mo
-share/locale/hr/LC_MESSAGES/WindowMaker.mo
-share/locale/hu/LC_MESSAGES/WPrefs.mo
-share/locale/hu/LC_MESSAGES/WindowMaker.mo
-share/locale/hy/LC_MESSAGES/WindowMaker.mo
-share/locale/it/LC_MESSAGES/WPrefs.mo
-share/locale/it/LC_MESSAGES/WindowMaker.mo
-share/locale/ja/LC_MESSAGES/WPrefs.mo
-share/locale/ja/LC_MESSAGES/WindowMaker.mo
-share/locale/ko/LC_MESSAGES/WPrefs.mo
-share/locale/ko/LC_MESSAGES/WindowMaker.mo
-share/locale/ms/LC_MESSAGES/WindowMaker.mo
-share/locale/nl/LC_MESSAGES/WindowMaker.mo
-share/locale/no/LC_MESSAGES/WindowMaker.mo
-share/locale/pl/LC_MESSAGES/WindowMaker.mo
-share/locale/pt/LC_MESSAGES/WPrefs.mo
-share/locale/pt/LC_MESSAGES/WindowMaker.mo
-share/locale/pt/LC_MESSAGES/wmgenmenu.mo
-share/locale/ro/LC_MESSAGES/WindowMaker.mo
-share/locale/ru/LC_MESSAGES/WPrefs.mo
-share/locale/ru/LC_MESSAGES/WindowMaker.mo
-share/locale/sk/LC_MESSAGES/WINGs.mo
-share/locale/sk/LC_MESSAGES/WPrefs.mo
-share/locale/sk/LC_MESSAGES/WindowMaker.mo
-share/locale/sv/LC_MESSAGES/WindowMaker.mo
-share/locale/tr/LC_MESSAGES/WindowMaker.mo
-share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
-share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
-share/locale/zh_TW/LC_MESSAGES/WPrefs.mo
-share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/be/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/WINGs.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/WINGs.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/WINGs.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/da/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/de/LC_MESSAGES/WINGs.mo
+%%NLS%%share/locale/de/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/de/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/de/LC_MESSAGES/wmgenmenu.mo
+%%NLS%%share/locale/el/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/es/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/es/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/es/LC_MESSAGES/wmgenmenu.mo
+%%NLS%%share/locale/et/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/et/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/WINGs.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/wmgenmenu.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/it/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/it/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/no/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/wmgenmenu.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/WINGs.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo
 @dirrm GNUstep/Applications/WPrefs.app/tiff
 @dirrm GNUstep/Applications/WPrefs.app/xpm
 @dirrm GNUstep/Applications/WPrefs.app