diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 5a2e2ed11f6b..b3f5029b12f9 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -75,6 +75,7 @@
     SUBDIR += larswm
     SUBDIR += libcompizconfig
     SUBDIR += libdockapp
+    SUBDIR += libwraster
     SUBDIR += lwm
     SUBDIR += lxsession
     SUBDIR += lxsession-lite
diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
new file mode 100644
index 000000000000..2ac524d25200
--- /dev/null
+++ b/x11-wm/libwraster/Makefile
@@ -0,0 +1,68 @@
+# New ports collection makefile for:	libwraster
+# Date created:				August 17, 2009
+# Whom:					dougb@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libwraster
+PORTVERSION=	0.92.0
+CATEGORIES=	x11-wm windowmaker
+MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
+		http://dougbarton.us/Downloads/
+MASTER_SITE_SUBDIR=	source/release
+DISTNAME=	WindowMaker-${PORTVERSION}
+
+MAINTAINER=	dougb@FreeBSD.org
+COMMENT=	libwraster from Window Maker
+
+LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
+		png.5:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff \
+
+MAKE_JOBS_SAFE=	yes
+
+USE_AUTOTOOLS=	libtool:22
+USE_BZIP2=	yes
+USE_GNOME=	pkgconfig
+USE_XORG=	xpm
+USE_PERL5=	yes
+USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
+		--with-nlsdir=${PREFIX}/share/locale \
+		--with-libs-from="-L${LOCALBASE}/lib" \
+		--with-incs-from="-I${LOCALBASE}/include" \
+		--with-gnustepdir="${PREFIX}/GNUstep" \
+		--disable-debug
+USE_LDCONFIG=	yes
+
+PATCHDIR=	${.CURDIR}/../windowmaker/files
+MD5_FILE=	${.CURDIR}/../windowmaker/distinfo
+
+CONFLICTS=	windowmaker-0.*
+
+PLIST_FILES=	bin/get-wraster-flags include/wraster.h lib/libwraster.a \
+		lib/libwraster.la lib/libwraster.so lib/libwraster.so.4 \
+		libdata/pkgconfig/wrlib.pc
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == amd64
+CONFIGURE_ENV+=	ac_cv_c_inline_asm=no
+.endif
+
+post-patch:
+	@${CP} ${WRKSRC}/wrlib/Makefile.in ${WRKSRC}/wrlib/Makefile.in.presed
+	@${SED} -e s#$$\(libdir\)/pkgconfig#${PREFIX}/libdata/pkgconfig#g \
+	    ${WRKSRC}/wrlib/Makefile.in.presed > ${WRKSRC}/wrlib/Makefile.in
+
+do-build:
+	cd ${WRKSRC}/wrlib && ${MAKE}
+
+do-install:
+	cd ${WRKSRC}/wrlib && ${MAKE} install
+
+.include <bsd.port.post.mk>
diff --git a/x11-wm/libwraster/pkg-descr b/x11-wm/libwraster/pkg-descr
new file mode 100644
index 000000000000..e02f0a401ad2
--- /dev/null
+++ b/x11-wm/libwraster/pkg-descr
@@ -0,0 +1,9 @@
+This is the libwraster library from x11-wm/windowmaker.
+
+The purpose of this port is to allow dockapp ports the choice of
+depending on the full Window Maker port, or just the library.
+
+WWW: http://www.windowmaker.info/
+
+- Doug Barton
+DougB@FreeBSD.org
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index ccc4924f4156..9de674691acc 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -42,6 +42,8 @@ CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--disable-debug
 USE_LDCONFIG=	yes
 
+CONFLICTS=	libwraster-0.*
+
 MANLANG=	"" sk
 MAN1=		geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
 		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x