diff --git a/x11/gnome/bonobo/Makefile b/x11/gnome/bonobo/Makefile
index 88dd3f54da1..bd7d5864db6 100644
--- a/x11/gnome/bonobo/Makefile
+++ b/x11/gnome/bonobo/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2004/12/15 13:57:56 alek Exp $
+# $OpenBSD: Makefile,v 1.11 2004/12/30 15:57:53 espie Exp $
 
 COMMENT=		"architecture for creating reusable software components"
 COMMENT-docs=		"documentation for the bonobo architecture"
 
 VERSION=		1.0.22
 DISTNAME=		bonobo-${VERSION}
-PKGNAME-docs=		bonobo-docs-${VERSION}
+PKGNAME-docs=		bonobo-docs-${VERSION}p0
 CATEGORIES=    		x11/gnome
 HOMEPAGE=		http://developer.gnome.org/arch/component/bonobo.html
 
@@ -16,9 +16,6 @@ PERMIT_PACKAGE_CDROM= 	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE IIOP ORBit ORBitCosNaming ORBitutil SM X11 Xext \
-			Xi audiofile c esd freetype gdk gdk_imlib gdk_pixbuf \
-			glib gmodule gtk jpeg m png popt tiff ungif wrap xml z
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bonobo/1.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -26,15 +23,17 @@ EXTRACT_SUFX=		.tar.bz2
 MULTI_PACKAGES=		-docs
 SUBPACKAGE?=		
 
-.if ${SUBPACKAGE} != "-docs"
+.if defined(PACKAGING) && ${SUBPACKAGE} == "-docs"
+PKG_ARCH=		*
+.else
+WANTLIB=		ICE IIOP ORBit ORBitCosNaming ORBitutil SM X11 Xext \
+			Xi audiofile c esd freetype gdk gdk_imlib gdk_pixbuf \
+			glib gmodule gtk jpeg m png popt tiff ungif wrap xml z
 MODULES=		devel/gettext
 LIB_DEPENDS=		art_lgpl.4,gnome.36,gnomesupport,gnomeui.46::x11/gnome/libs \
 			oaf::x11/gnome/oaf \
 			gnomeprint.16::x11/gnome/print
 .endif
-.if defined(PACKAGING) && ${SUBPACKAGE} == "-docs"
-PKG_ARCH=		*
-.endif
 
 SEPARATE_BUILD=		concurrent
 USE_X11=		Yes