diff --git a/net/gtk+licq/Makefile b/net/gtk+licq/Makefile
index 9cc7349b13c3..84ba3de7a125 100644
--- a/net/gtk+licq/Makefile
+++ b/net/gtk+licq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk+licq
 PORTVERSION=	0.50.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://gtk.licq.org/download/
 
@@ -31,9 +31,17 @@ USE_GNOME=	yes
 CONFIGURE_ARGS=	--enable-gnome
 .else
 CONFIGURE_ARGS=	--disable-gnome
+.endif
+
 post-patch:
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL5} -pi -e \
+		's|-D_REENTRANT|${PTHREAD_CFLAGS} -D_REENTRANT|g ; \
+		s|^localedir =.*|localedir = \$$(prefix)/share/locale| ; \
+		s|^gtklicq_helpdir =.*|gtklicq_helpdir = \
+		\$$(datadir)/help/gtk+licq/C|'
+.if !defined(HAVE_GNOME)
 	@${PERL5} -pi -e \
-		's|^SUBDIRS\ =.*|SUBDIRS\ =\ |' ${WRKSRC}/doc/Makefile.in
+		's|^SUBDIRS =.*|SUBDIRS =|' ${WRKSRC}/doc/Makefile.in
 .endif
 
 post-configure:
diff --git a/net/gtk+licq/files/patch-po::Makefile.in b/net/gtk+licq/files/patch-po::Makefile.in
deleted file mode 100644
index d85f625d56ed..000000000000
--- a/net/gtk+licq/files/patch-po::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Wed Aug 23 20:00:23 2000
-+++ po/Makefile.in.in	Sun Oct 15 11:11:11 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po