diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 4840882f27e..ba6fa4be94f 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2009/08/10 06:30:30 kili Exp $
+# $OpenBSD: Makefile,v 1.10 2009/10/10 23:06:55 steven Exp $
 
 COMMENT=	printed circuit board layout tool
 DISTNAME=	pcb-20070912
-PKGNAME=	${DISTNAME}p4
+PKGNAME=	${DISTNAME}p5
 CATEGORIES=	cad
 
 HOMEPAGE=	http://pcb.sourceforge.net/
@@ -24,12 +24,12 @@ WANTLIB += png pthread-stubs xcb z
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcb/}
 
 RUN_DEPENDS=	::devel/m4 \
-		:tk->=8.4,<8.5:x11/tk/8.4
+		${MODTK_RUN_DEPENDS}
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	gd.>=20::graphics/gd \
 		gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
 
-MODULES=	devel/gettext
+MODULES=	devel/gettext x11/tk
 
 USE_X11=	Yes
 CONFIGURE_STYLE=gnu
diff --git a/cad/pcb/patches/patch-configure b/cad/pcb/patches/patch-configure
index e894dfc25b7..9126407edd3 100644
--- a/cad/pcb/patches/patch-configure
+++ b/cad/pcb/patches/patch-configure
@@ -1,12 +1,12 @@
-$OpenBSD: patch-configure,v 1.2 2007/09/16 12:54:38 steven Exp $
+$OpenBSD: patch-configure,v 1.3 2009/10/10 23:06:55 steven Exp $
 --- configure.orig	Thu Sep 13 01:46:17 2007
-+++ configure	Sat Sep 15 11:13:51 2007
++++ configure	Sun Oct 11 00:49:28 2009
 @@ -5810,7 +5810,7 @@ echo "${ECHO_T}no" >&6; }
  fi
  
  
 -for ac_prog in wish wish83 wish8.3 wish80 wish8.0 cygwish83 cygwish80
-+for ac_prog in wish wish84 wish8.4 wish80 wish8.0 cygwish83 cygwish80
++for ac_prog in wish wish85 wish8.5 wish84 wish8.4 wish80 wish8.0 cygwish83 cygwish80
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
diff --git a/cad/pcb/patches/patch-example_Makefile_in b/cad/pcb/patches/patch-example_Makefile_in
index f141561560d..549794ff187 100644
--- a/cad/pcb/patches/patch-example_Makefile_in
+++ b/cad/pcb/patches/patch-example_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-example_Makefile_in,v 1.2 2007/09/16 12:54:38 steven Exp $
+$OpenBSD: patch-example_Makefile_in,v 1.3 2009/10/10 23:06:55 steven Exp $
 --- example/Makefile.in.orig	Thu Sep 13 03:09:44 2007
-+++ example/Makefile.in	Sat Sep 15 11:14:19 2007
++++ example/Makefile.in	Sun Oct 11 00:48:47 2009
 @@ -204,7 +204,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
diff --git a/cad/pcb/patches/patch-example_libraries_Makefile_in b/cad/pcb/patches/patch-example_libraries_Makefile_in
index a28a767b7ce..9f397ce244e 100644
--- a/cad/pcb/patches/patch-example_libraries_Makefile_in
+++ b/cad/pcb/patches/patch-example_libraries_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-example_libraries_Makefile_in,v 1.2 2007/09/16 12:54:38 steven Exp $
+$OpenBSD: patch-example_libraries_Makefile_in,v 1.3 2009/10/10 23:06:55 steven Exp $
 --- example/libraries/Makefile.in.orig	Thu Sep 13 03:09:45 2007
-+++ example/libraries/Makefile.in	Sat Sep 15 11:14:38 2007
++++ example/libraries/Makefile.in	Sun Oct 11 00:48:47 2009
 @@ -192,7 +192,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
diff --git a/cad/pcb/pkg/PLIST b/cad/pcb/pkg/PLIST
index 454058802a3..228dda606c9 100644
--- a/cad/pcb/pkg/PLIST
+++ b/cad/pcb/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/09/16 12:54:38 steven Exp $
+@comment $OpenBSD: PLIST,v 1.3 2009/10/10 23:06:55 steven Exp $
 bin/MergePCBPS
 bin/Merge_dimPCBPS
-bin/pcb
+@bin bin/pcb
 @info info/pcb.info
 @man man/man1/pcb.1
 share/doc/pcb/