diff --git a/x11/compositeext/Makefile b/x11/compositeext/Makefile
index 677e27f60ba0..3524063459c9 100644
--- a/x11/compositeext/Makefile
+++ b/x11/compositeext/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	compositeext
-PORTVERSION=	2.0.p1
+PORTVERSION=	2.0
 CATEGORIES=	x11
-MASTER_SITES=	http://pdx.freedesktop.org/~anholt/dist/
+MASTER_SITES=	http://pdx.freedesktop.org/~xlibs/release/
 
 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}
+BUILD_DEPENDS=	${LIB_PC_DEPENDS}
 RUN_DEPENDS=	${LIB_PC_DEPENDS}
 
 USE_BZIP2=	yes
@@ -24,6 +23,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-2.0
+USE_GNOME=	gnomehack pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11/compositeext/distinfo b/x11/compositeext/distinfo
index 16a2d1e995d4..d618a0e98e46 100644
--- a/x11/compositeext/distinfo
+++ b/x11/compositeext/distinfo
@@ -1 +1 @@
-MD5 (compositeext-2.0.p1.tar.bz2) = 2cb608e6d69c190bdf1d74f8f6eae060
+MD5 (compositeext-2.0.tar.bz2) = 315ce9665059f1b2f4067cc8bd7ecf44
diff --git a/x11/compositeext/files/patch-Makefile.in b/x11/compositeext/files/patch-Makefile.in
deleted file mode 100644
index 7794322a5cdc..000000000000
--- a/x11/compositeext/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)