diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index a3a11b70841..f37e67a6545 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2006/11/21 20:58:51 espie Exp $
+# $OpenBSD: Makefile,v 1.28 2007/06/02 14:54:53 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -8,7 +8,7 @@ COMMENT-demo=	"demonstrate the features of ptk"
 MODULES=	cpan
 VERSION=	804.027
 DISTNAME=	Tk-${VERSION}
-PKGNAME-main=	p5-Tk-${VERSION}p1
+PKGNAME-main=	p5-Tk-${VERSION}p2
 PKGNAME-demo=	p5-Tk-demo-${VERSION}p0
 CATEGORIES=	x11 devel
 
diff --git a/x11/p5-Tk/patches/patch-PNG_Makefile_PL b/x11/p5-Tk/patches/patch-PNG_Makefile_PL
index 73d1ceb1913..d15fde1870b 100644
--- a/x11/p5-Tk/patches/patch-PNG_Makefile_PL
+++ b/x11/p5-Tk/patches/patch-PNG_Makefile_PL
@@ -1,7 +1,7 @@
-$OpenBSD: patch-PNG_Makefile_PL,v 1.1 2005/07/05 21:10:44 naddy Exp $
---- PNG/Makefile.PL.orig	Tue Jul  5 20:57:20 2005
-+++ PNG/Makefile.PL	Tue Jul  5 20:58:11 2005
-@@ -15,7 +15,7 @@ foreach my $file (qw(zlib/Makefile.PL li
+$OpenBSD: patch-PNG_Makefile_PL,v 1.2 2007/06/02 14:54:53 ajacoutot Exp $
+--- PNG/Makefile.PL.orig	Tue Dec 30 11:45:03 2003
++++ PNG/Makefile.PL	Sat Jun  2 16:10:46 2007
+@@ -15,7 +15,7 @@ foreach my $file (qw(zlib/Makefile.PL libpng/Makefile.
   }
  
  if ($Tk::MMtry::VERSION ge '4.007' &&
diff --git a/x11/p5-Tk/patches/patch-Tk_ColorEditor_pm b/x11/p5-Tk/patches/patch-Tk_ColorEditor_pm
new file mode 100644
index 00000000000..d565feaed2c
--- /dev/null
+++ b/x11/p5-Tk/patches/patch-Tk_ColorEditor_pm
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Tk_ColorEditor_pm,v 1.1 2007/06/02 14:54:53 ajacoutot Exp $
+--- Tk/ColorEditor.pm.orig	Sat Jun  2 15:16:35 2007
++++ Tk/ColorEditor.pm	Sat Jun  2 15:17:03 2007
+@@ -20,7 +20,7 @@ sub Populate
+                     split /\s+/, $Tk::Config::xlib;
+     foreach $i (@xlibpath,
+ 		'/usr/local/lib/X11/rgb.txt', '/usr/lib/X11/rgb.txt',
+-		'/usr/X11R6/lib/X11/rgb.txt',
++		'/usr/X11R6/share/X11/rgb.txt',
+                 '/usr/local/X11R5/lib/X11/rgb.txt', '/X11/R5/lib/X11/rgb.txt',
+                 '/X11/R4/lib/rgb/rgb.txt', '/usr/openwin/lib/X11/rgb.txt') {
+         local *FOO;