diff --git a/x11/p5-Gtk/Makefile b/x11/p5-Gtk/Makefile
index 16695cd74da..5e75be9d66e 100644
--- a/x11/p5-Gtk/Makefile
+++ b/x11/p5-Gtk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2002/12/29 20:31:41 fgsch Exp $
+# $OpenBSD: Makefile,v 1.12 2003/02/02 19:14:24 jcs Exp $
 
 COMMENT=	"set of modules to use Gtk+ libraries from Perl"
 
@@ -44,6 +44,7 @@ FAKE_FLAGS=	${MAKE_FLAGS} \
 		INSTALLSITELIB="${PERLDIR}" \
 		INSTALLSITEARCH="${PERLDIR}/${MACHINE_ARCH}-openbsd" \
 		INSTALLMAN3DIR="${DESTDIR}/${PREFIX}/man/man3p" \
+		INSTALLSITEMAN3DIR="${DESTDIR}/${PREFIX}/man/man3p"
 
 FLAVORS=	gtkglarea
 FLAVOR?=	
diff --git a/x11/p5-Gtk/patches/patch-Gtk_Makefile_PL b/x11/p5-Gtk/patches/patch-Gtk_Makefile_PL
index 05c5ac60c4d..0b5f49b7bb6 100644
--- a/x11/p5-Gtk/patches/patch-Gtk_Makefile_PL
+++ b/x11/p5-Gtk/patches/patch-Gtk_Makefile_PL
@@ -1,6 +1,15 @@
-$OpenBSD: patch-Gtk_Makefile_PL,v 1.1 2001/12/09 05:06:01 jcs Exp $
---- Gtk/Makefile.PL.orig	Sat Dec  8 22:31:00 2001
-+++ Gtk/Makefile.PL	Sat Dec  8 22:31:15 2001
+# $OpenBSD: patch-Gtk_Makefile_PL,v 1.2 2003/02/02 19:14:25 jcs Exp $
+--- Gtk/Makefile.PL.orig	Sat May 26 11:08:38 2001
++++ Gtk/Makefile.PL	Sun Feb  2 11:44:25 2003
+@@ -59,7 +59,7 @@
+ 
+ $gtk_hverstr = sprintf("0x%02x%02x%02x", $gtk_major, $gtk_minor, $gtk_micro);
+ 
+-push @defines, "-DGTK_HVER=$gtk_hverstr";
++push @defines, "-DGTK_HVER=$gtk_hverstr -o \$*.o";
+ 
+ if (not defined $gtk_version) {
+ 	die "Unable to find  Gtk version...\n";
 @@ -160,11 +160,11 @@
  	'dist' => { COMPRESS=>"gzip", SUFFIX=>"gz" },
  	'OPTIMIZE' => '-O2 -g',
@@ -18,3 +27,22 @@ $OpenBSD: patch-Gtk_Makefile_PL,v 1.1 2001/12/09 05:06:01 jcs Exp $
  		},
  	$gtk->get_makefile_vars,
  );
+@@ -187,12 +187,12 @@
+ 
+ }
+ 
+-sub MY::c_o {
+-	package MY; # so that "SUPER" works right
+-	my $inherited = shift->SUPER::c_o(@_);
+-	$inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+-    $inherited;
+-}
++#sub MY::c_o {
++#	package MY; # so that "SUPER" works right
++#	my $inherited = shift->SUPER::c_o(@_);
++#	$inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
++#    $inherited;
++#}
+ 
+ sub MY::const_config
+ {
diff --git a/x11/p5-Gtk/patches/patch-Makefile_PL b/x11/p5-Gtk/patches/patch-Makefile_PL
new file mode 100644
index 00000000000..e17003fceaf
--- /dev/null
+++ b/x11/p5-Gtk/patches/patch-Makefile_PL
@@ -0,0 +1,12 @@
+# $OpenBSD: patch-Makefile_PL,v 1.1 2003/02/02 19:14:25 jcs Exp $
+--- Makefile.PL.orig	Sun Feb  2 11:55:47 2003
++++ Makefile.PL	Sun Feb  2 11:57:03 2003
+@@ -22,7 +22,7 @@
+ 		check => sub {ccompile('#include <gtkgl/gtkglarea.h>', "", `gtk-config --cflags`,
+ 					"-lgtkgl  -lGL -lGLU " . `gtk-config --libs`)}},
+ 	gdkpixbuf => {order => 2, dir => 'GdkPixbuf', depends => [qw(gtk)],
+-		check => sub {cconfig('gdk-pixbuf-config --version', '0\.(8|9|1\d)\.?')}},
++		check => sub {cconfig('gdk-pixbuf-config --version', '0\.(8|9|1\d|2\d)\.?')}},
+ 	gtkhtml => {order => 2, dir => 'GtkHTML', depends => [qw(gtk)],
+ 		check => sub {cconfig('gnome-config --modversion gtkhtml', 'gtkhtml-0\.[89]')}},
+ 	gtkxmhtml => {order => 2, dir => 'GtkXmHTML', depends => [qw(gtk)],