diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 8d911a5ee24..3f2d8026173 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2005/05/24 19:49:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.36 2005/09/05 13:53:45 espie Exp $
 
 COMMENT=		"simple paint program"
 
 DISTNAME=		xpaint-2.7.7
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		graphics x11
 
 HOMEPAGE=		http://sf-xpaint.sourceforge.net/
diff --git a/graphics/xpaint/patches/patch-Local_config b/graphics/xpaint/patches/patch-Local_config
index dcd331d9d97..926470c328e 100644
--- a/graphics/xpaint/patches/patch-Local_config
+++ b/graphics/xpaint/patches/patch-Local_config
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Local_config,v 1.3 2005/05/24 19:49:28 naddy Exp $
---- Local.config.orig	Sat Apr 30 15:33:14 2005
-+++ Local.config	Tue May 24 12:15:44 2005
+$OpenBSD: patch-Local_config,v 1.4 2005/09/05 13:53:45 espie Exp $
+--- Local.config.orig	Sat Apr 30 23:33:14 2005
++++ Local.config	Mon Sep  5 15:51:50 2005
 @@ -162,6 +162,22 @@ XCOMM CDEBUGFLAGS =
  
  XCOMM This should take care of everything needed for BSD.
@@ -15,7 +15,7 @@ $OpenBSD: patch-Local_config,v 1.3 2005/05/24 19:49:28 naddy Exp $
 +PNG_LIB      = -L${DEPBASE}/lib -lpng -lz
 +XPM_INCLUDE  = -I${X11BASE}/include/X11
 +BINDIR       = ${TRUEPREFIX}/bin
-+MANDIR       = ${TRUEPREFIX}/man
++MANDIR       = ${TRUEPREFIX}/man/cat1
 +SHAREDIR     = ${TRUEPREFIX}/share/xpaint
 +XAPPLOADDIR  = ${TRUEPREFIX}/lib/X11/app-defaults
 +EDITOR       = xterm -fn 9x15 -cr green -ms red -bg lightyellow -fg black -e vi
diff --git a/graphics/xpaint/pkg/PLIST b/graphics/xpaint/pkg/PLIST
index d8e75eaea9b..3d356fdb0db 100644
--- a/graphics/xpaint/pkg/PLIST
+++ b/graphics/xpaint/pkg/PLIST
@@ -1,9 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.6 2005/05/24 19:49:28 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.7 2005/09/05 13:53:45 espie Exp $
 bin/xpaint
 lib/X11/app-defaults/XPaint
 lib/X11/app-defaults/XPaint_es
 lib/X11/app-defaults/XPaint_fr
-man/xpaint.0
+@man man/cat1/xpaint.0
 share/xpaint/
 share/xpaint/XPaintIcon.xpm
 share/xpaint/c_scripts/
diff --git a/misc/xd/Makefile b/misc/xd/Makefile
index a27e30319f7..63edae2765a 100644
--- a/misc/xd/Makefile
+++ b/misc/xd/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2004/12/22 11:50:30 alek Exp $
+# $OpenBSD: Makefile,v 1.13 2005/09/05 13:50:20 espie Exp $
 
 COMMENT=	"yet another dump utility"
 
 DISTNAME=	xd-8087
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
diff --git a/misc/xd/patches/patch-Makefile b/misc/xd/patches/patch-Makefile
index 13be11708d2..8e958286386 100644
--- a/misc/xd/patches/patch-Makefile
+++ b/misc/xd/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.1 2004/06/25 19:07:10 xsa Exp $
---- Makefile.orig	Mon Aug 26 11:02:31 1996
-+++ Makefile	Fri Jun 25 15:25:57 2004
+$OpenBSD: patch-Makefile,v 1.2 2005/09/05 13:50:20 espie Exp $
+--- Makefile.orig	Mon Aug 26 19:02:31 1996
++++ Makefile	Mon Sep  5 15:49:24 2005
 @@ -1,7 +1,7 @@
  #
 -CC=gcc
@@ -8,7 +8,7 @@ $OpenBSD: patch-Makefile,v 1.1 2004/06/25 19:07:10 xsa Exp $
 -MANDIR=/usr/local/man/man
 +#CC=gcc
 +BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man/man
++MANDIR=${PREFIX}/man/cat
  PROG=xd
  
  .include <bsd.prog.mk>
diff --git a/misc/xd/pkg/PLIST b/misc/xd/pkg/PLIST
index 09b31f10160..b089901272b 100644
--- a/misc/xd/pkg/PLIST
+++ b/misc/xd/pkg/PLIST
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/08/21 05:11:06 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.3 2005/09/05 13:50:20 espie Exp $
 bin/xd
-man/man1/xd.0
+@man man/cat1/xd.0