diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 61e906ac486c..d5aec468cc7d 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -6,8 +6,7 @@
 #    $MCom: ports/audio/grip/Makefile,v 1.4 2007/05/19 21:35:57 marcus Exp $
 
 PORTNAME=	grip
-PORTVERSION=	3.2.0
-PORTREVISION=	25
+PORTVERSION=	3.3.1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -20,7 +19,6 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 USE_XORG=	x11
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui vte
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -86,6 +84,14 @@ RUN_DEPENDS+=	bladeenc:${PORTSDIR}/audio/bladeenc
 RUN_DEPENDS+=	ogg123:${PORTSDIR}/audio/vorbis-tools
 .endif
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.endif
+
 pre-everything::
 .if !defined(WITH_CDROM_DEVICE)
 	@${ECHO_MSG} "===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}"
diff --git a/audio/grip/distinfo b/audio/grip/distinfo
index 91f0ac848c6e..fd8bf939d4a4 100644
--- a/audio/grip/distinfo
+++ b/audio/grip/distinfo
@@ -1,3 +1,3 @@
-MD5 (grip-3.2.0.tar.gz) = 9b51933a03dd7d7ddfbb3643fc82c2d0
-SHA256 (grip-3.2.0.tar.gz) = 5a51a67f2828aa679a46bbb95cdc5346d6d4516f8ba74b7744b6049ccbe805ca
-SIZE (grip-3.2.0.tar.gz) = 722039
+MD5 (grip-3.3.1.tar.gz) = 4b4233999b9f2bc85c711092553ea9aa
+SHA256 (grip-3.3.1.tar.gz) = d46394a1062ed066f9c633b010fd1059e63d9ed791bbb7a85bc6567cf0fd66fd
+SIZE (grip-3.3.1.tar.gz) = 812562
diff --git a/audio/grip/files/patch-src::discdb b/audio/grip/files/patch-src::discdb
deleted file mode 100644
index 1d300b270f0e..000000000000
--- a/audio/grip/files/patch-src::discdb
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/discdb.c.orig	Thu Apr 15 21:23:37 2004
-+++ src/discdb.c	Wed Mar 16 19:02:09 2005
-@@ -311,7 +311,7 @@
-     query->query_match=MATCH_EXACT;
-     query->query_matches=0;
- 
--    while((inbuffer=DiscDBReadLine(&dataptr))) {
-+    while(query->query_matches < MAX_INEXACT_MATCHES && (inbuffer=DiscDBReadLine(&dataptr))) {
-       query->query_list[query->query_matches].list_genre=
- 	DiscDBGenreValue(g_strstrip(strtok(inbuffer," ")));
-       
-@@ -331,7 +331,7 @@
-     query->query_match=MATCH_INEXACT;
-     query->query_matches=0;
- 
--    while((inbuffer=DiscDBReadLine(&dataptr))) {
-+    while(query->query_matches < MAX_INEXACT_MATCHES && (inbuffer=DiscDBReadLine(&dataptr))) {
-       query->query_list[query->query_matches].list_genre=
- 	DiscDBGenreValue(g_strstrip(strtok(inbuffer," ")));
-       
diff --git a/audio/grip/files/patch-src::main.c b/audio/grip/files/patch-src::main.c
index 40f1bc169bc9..7da04c7fd540 100644
--- a/audio/grip/files/patch-src::main.c
+++ b/audio/grip/files/patch-src::main.c
@@ -1,11 +1,11 @@
---- src/main.c.orig
-+++ src/main.c
-@@ -163,7 +163,7 @@
+--- src/main.c.orig	2010-04-13 08:46:10.000000000 -0300
++++ src/main.c	2010-04-13 08:46:45.000000000 -0300
+@@ -164,7 +164,7 @@
  		     GNOME_PARAM_POPT_TABLE,options,
  		     GNOME_PROGRAM_STANDARD_PROPERTIES,NULL);
  
 -  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF8");
 +  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+   setenv("CHARSET","UTF-8",1);
  
    /* Session Management */
-   
diff --git a/audio/grip/pkg-plist b/audio/grip/pkg-plist
index 698ac75724ec..7e267daf2d7d 100644
--- a/audio/grip/pkg-plist
+++ b/audio/grip/pkg-plist
@@ -49,22 +49,28 @@ share/gnome/help/grip/C/stop.png
 share/gnome/help/grip/C/trkedit.png
 share/gnome/help/grip/C/volume.png
 share/pixmaps/gripicon.png
-share/locale/be/LC_MESSAGES/grip-2.2.mo
-share/locale/bg/LC_MESSAGES/grip-2.2.mo
-share/locale/ca/LC_MESSAGES/grip-2.2.mo
-share/locale/de/LC_MESSAGES/grip-2.2.mo
-share/locale/es/LC_MESSAGES/grip-2.2.mo
-share/locale/fi/LC_MESSAGES/grip-2.2.mo
-share/locale/fr/LC_MESSAGES/grip-2.2.mo
-share/locale/it/LC_MESSAGES/grip-2.2.mo
-share/locale/ja/LC_MESSAGES/grip-2.2.mo
-share/locale/pt_BR/LC_MESSAGES/grip-2.2.mo
-share/locale/ru/LC_MESSAGES/grip-2.2.mo
-share/locale/zh_CN/LC_MESSAGES/grip-2.2.mo
-share/locale/zh_HK/LC_MESSAGES/grip-2.2.mo
-share/locale/zh_TW/LC_MESSAGES/grip-2.2.mo
+share/pixmaps/griptray.png
+%%NLS%%share/locale/be/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/pl_PL/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/grip-2.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/grip-2.2.mo
 @dirrm share/gnome/help/grip/C
 @dirrm share/gnome/help/grip
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/applications