diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 6a64e5d4ad2c..f072f8a24d46 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.2.20
+PORTVERSION=	1.2.21
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -30,18 +30,18 @@ CONFIGURE_ARGS=	--enable-shaped-decorations \
 		--with-docdir=${PREFIX}/share/doc \
 		--with-mkfontdir=${NONEXISTENT}
 
-OPTIONS=	GNOME	"Enable GNOME desktop support"	off \
-		IMLIB	"Build with Imlib support"	off \
-		ESOUND	"Enable EsounD daemon support"	off \
-		XFT	"Enable Xft support for fonts"	on \
-		XINERAMA "Enable Xinerama support"	on \
-		X86_ASM	"Use optimized x86 assembly code" on \
-		BEASTIE	"Use Beastie'fied startup button" off \
-		NLS	"Enable National Language Support" on
+OPTIONS=	GNOMEDESKTOP	"Enable GNOME desktop support"		off \
+		IMLIB		"Build with Imlib support"		off \
+		ESOUND		"Enable EsounD daemon support"		off \
+		XFT		"Enable Xft support for fonts"		on \
+		XINERAMA	"Enable Xinerama support"		on \
+		X86_ASM		"Use optimized x86 assembly code"	on \
+		BEASTIE		"Use Beastie'fied startup button"	off \
+		NLS		"Enable National Language Support"	on
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgnomedesktop}!="" || defined(WITH_GNOME)
+.if ${HAVE_GNOME:Mgnomedesktop}!="" || defined(WITH_GNOMEDESKTOP)
 USE_GNOME+=	gnomedesktop
 CONFIGURE_ARGS+=	--enable-menus-gnome2
 INSTALL_TARGET=		install install-gnome
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 41b1929037c8..b3d30f4e35e5 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1,2 +1,2 @@
-MD5 (icewm-1.2.20.tar.gz) = 6c94dae56fbf9aa085a1d780538018c1
-SIZE (icewm-1.2.20.tar.gz) = 948530
+MD5 (icewm-1.2.21.tar.gz) = 0c17d89fea9044d79a29b88aa6199968
+SIZE (icewm-1.2.21.tar.gz) = 969491
diff --git a/x11-wm/icewm/pkg-descr b/x11-wm/icewm/pkg-descr
index ed8878635aca..87e216a5476e 100644
--- a/x11-wm/icewm/pkg-descr
+++ b/x11-wm/icewm/pkg-descr
@@ -2,4 +2,4 @@ Window Manager designed for speed, usability and consistency.
 
 'bsd-daemon.xpm' is from Steve Farrell.
 
-WWW: http://icewm.sourceforge.net/
+WWW: http://www.icewm.org/
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 4384b77b2f7c..1e52d216426e 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -344,6 +344,7 @@ bin/icewmtray
 %%NLS%%share/locale/fr/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/icewm.mo
+%%NLS%%share/locale/id/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/it/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/icewm.mo
@@ -359,6 +360,7 @@ bin/icewmtray
 %%NLS%%share/locale/sv/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/icewm.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
 @dirrm %%DATADIR%%/themes/yellowmotif