diff --git a/devel/libgtop/patches/patch-configure b/devel/libgtop/patches/patch-configure
index 19095da2e8f..8d6350b1f32 100644
--- a/devel/libgtop/patches/patch-configure
+++ b/devel/libgtop/patches/patch-configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.2 2001/11/27 23:07:02 todd Exp $
+$OpenBSD: patch-configure,v 1.3 2004/10/01 23:54:45 naddy Exp $
 --- configure.orig	Mon Nov 26 23:50:58 2001
-+++ configure	Tue Nov 27 23:00:58 2001
++++ configure	Thu Sep 30 22:55:40 2004
 @@ -15,6 +15,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset
      *-DOS) lt_cv_sys_path_separator=';' ;;
      *)     lt_cv_sys_path_separator=':' ;;
@@ -111,14 +111,41 @@ $OpenBSD: patch-configure,v 1.2 2001/11/27 23:07:02 todd Exp $
  	  ;;
  	solaris*)
  	  libgtop_sysdeps_dir=solaris
-@@ -14767,6 +14810,10 @@ echo "${ECHO_T}$gt_cv_func_gettext_libin
- fi
+@@ -14657,7 +14700,7 @@ if test "${ac_cv_lib_intl_bindtextdomain
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lintl  $LIBS"
++LIBS="-lintl -liconv $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 14662 "configure"
+ #include "confdefs.h"
+@@ -14712,7 +14755,7 @@ if test "${ac_cv_lib_intl_gettext+set}" 
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lintl  $LIBS"
++LIBS="-lintl -liconv $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 14717 "configure"
+ #include "confdefs.h"
+@@ -14768,6 +14811,10 @@ fi
  
  	   fi
-+
+ 
 +       if test "$gt_cv_func_gettext_libintl" = "yes"; then
 +          LIBS="$LIBS -lintl";
 +       fi
- 
++
  	   if test "$gt_cv_func_gettext_libc" = "yes" \
  	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
+ 	      cat >>confdefs.h <<\EOF
+@@ -14995,7 +15042,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
+ 	    # Added by Martin Baulig 12/15/98 for libc5 systems
+ 	    if test "$gt_cv_func_gettext_libc" != "yes" \
+ 	       && test "$gt_cv_func_gettext_libintl" = "yes"; then
+-	       INTLLIBS=-lintl
++	       INTLLIBS="-lintl -liconv"
+ 	       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ 	    fi
+ 
diff --git a/devel/libgtop/patches/patch-po_Makefile_in_in b/devel/libgtop/patches/patch-po_Makefile_in_in
new file mode 100644
index 00000000000..20ad090d3f3
--- /dev/null
+++ b/devel/libgtop/patches/patch-po_Makefile_in_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-po_Makefile_in_in,v 1.3 2004/10/01 23:54:45 naddy Exp $
+--- po/Makefile.in.in.orig	Thu Sep 30 23:43:07 2004
++++ po/Makefile.in.in	Thu Sep 30 23:43:17 2004
+@@ -19,7 +19,7 @@ VPATH = @srcdir@
+ 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