diff --git a/x11/Makefile b/x11/Makefile
index 27346c03fbf6..52a0e942e2fc 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -23,6 +23,7 @@
     SUBDIR += buttonbox
     SUBDIR += chameleon
     SUBDIR += cnslock
+    SUBDIR += compositeext
     SUBDIR += damageext
     SUBDIR += decurs
     SUBDIR += deskmenu
diff --git a/x11/compositeext/Makefile b/x11/compositeext/Makefile
new file mode 100644
index 000000000000..677e27f60ba0
--- /dev/null
+++ b/x11/compositeext/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:   compositeext
+# Date Created:			13 Nov, 2003
+# Whom:				Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	compositeext
+PORTVERSION=	2.0.p1
+CATEGORIES=	x11
+MASTER_SITES=	http://pdx.freedesktop.org/~anholt/dist/
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X Composite extension headers and specification
+
+LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/fixesext.pc:${PORTSDIR}/x11/fixesext
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
+		${LIB_PC_DEPENDS}
+RUN_DEPENDS=	${LIB_PC_DEPENDS}
+
+USE_BZIP2=	yes
+PREFIX?=	${X11BASE}
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GMAKE=	yes
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-2.0
+
+.include <bsd.port.mk>
diff --git a/x11/compositeext/distinfo b/x11/compositeext/distinfo
new file mode 100644
index 000000000000..16a2d1e995d4
--- /dev/null
+++ b/x11/compositeext/distinfo
@@ -0,0 +1 @@
+MD5 (compositeext-2.0.p1.tar.bz2) = 2cb608e6d69c190bdf1d74f8f6eae060
diff --git a/x11/compositeext/files/patch-Makefile.in b/x11/compositeext/files/patch-Makefile.in
new file mode 100644
index 000000000000..7794322a5cdc
--- /dev/null
+++ b/x11/compositeext/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Nov 13 13:47:39 2003
++++ Makefile.in	Thu Nov 13 13:54:09 2003
+@@ -126,7 +126,7 @@
+ compositeextdocdir = $(datadir)/doc/compositeext
+ compositeextdoc_DATA = protocol
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = compositeext.pc
+ 
+ EXTRA_DIST = autogen.sh compositeext.pc.in $(compositeextdoc_DATA)
diff --git a/x11/compositeext/pkg-descr b/x11/compositeext/pkg-descr
new file mode 100644
index 000000000000..0aaa986a39ad
--- /dev/null
+++ b/x11/compositeext/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the X Composite extension headers and specification
+
+WWW: http://www.freedesktop.org/Software/xlibs
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/compositeext/pkg-plist b/x11/compositeext/pkg-plist
new file mode 100644
index 000000000000..fc03b10ee214
--- /dev/null
+++ b/x11/compositeext/pkg-plist
@@ -0,0 +1,5 @@
+include/X11/extensions/composite.h
+include/X11/extensions/compositeproto.h
+libdata/pkgconfig/compositeext.pc
+%%DOCSDIR%%/protocol
+@dirrm %%DOCSDIR%%