diff --git a/xproto/DESCR b/xproto/DESCR
index 141ca64bd8..248e57701e 100644
--- a/xproto/DESCR
+++ b/xproto/DESCR
@@ -1,2 +1 @@
-X protocol and ancillary headers from freedesktop.org's X Libraries and
-Protocol Headers Project.
+X protocol and ancillary headers from modular Xorg X11.
diff --git a/xproto/Makefile b/xproto/Makefile
index 050aa56baf..84b906b8f2 100644
--- a/xproto/Makefile
+++ b/xproto/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:16:34 tvierling Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/07 05:13:03 jeremy-c-reed Exp $
 #
 
-DISTNAME=		xproto-6.6.2
+DISTNAME=		xproto-7.0
 CATEGORIES=		x11 devel
-MASTER_SITES=		http://freedesktop.org/~xlibs/release/
+MASTER_SITES=		http://xorg.freedesktop.org/X11R7.0-RC0/proto/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		reed@reedmedia.net
-HOMEPAGE=		http://xlibs.freedesktop.org/
-COMMENT=		X protocol and ancillary headers
-
-CONFLICTS+=		XFree86-libs-[0-9]*
+HOMEPAGE=		http://xorg.freedesktop.org/
+COMMENT=		X protocol and ancillary headers from Xorg X11
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PKGCONFIG_OVERRIDE+=	xproto.pc.in
 GNU_CONFIGURE=		yes
+PKGCONFIG_OVERRIDE+=	xproto.pc.in
+USE_LANGUAGES=		# empty
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/xproto/PLIST b/xproto/PLIST
index ac0a443ef2..e71ad2bbda 100644
--- a/xproto/PLIST
+++ b/xproto/PLIST
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2004/05/08 20:13:03 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/08/07 05:13:03 jeremy-c-reed Exp $
+include/X11/DECkeysym.h
+include/X11/HPkeysym.h
+include/X11/Sunkeysym.h
 include/X11/X.h
 include/X11/XF86keysym.h
+include/X11/XWDFile.h
 include/X11/Xalloca.h
 include/X11/Xarch.h
 include/X11/Xatom.h
@@ -15,6 +19,11 @@ include/X11/Xpoll.h
 include/X11/Xproto.h
 include/X11/Xprotostr.h
 include/X11/Xthreads.h
+include/X11/Xw32defs.h
+include/X11/Xwindows.h
+include/X11/Xwinsock.h
+include/X11/ap_keysym.h
 include/X11/keysym.h
 include/X11/keysymdef.h
 lib/pkgconfig/xproto.pc
+@dirrm include/X11
diff --git a/xproto/TODO b/xproto/TODO
index 0744e7b27e..7a4d11317d 100644
--- a/xproto/TODO
+++ b/xproto/TODO
@@ -1,5 +1 @@
-should this be called libXtrans?
-
-need to buildlink for xtrans for include/X11/Xtrans/transport.c
-
-- anyone want to maintain this
+- any want to maintain this?
diff --git a/xproto/distinfo b/xproto/distinfo
index 2922734cb7..bb48ecfb16 100644
--- a/xproto/distinfo
+++ b/xproto/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.5 2004/05/08 20:13:03 minskim Exp $
+$NetBSD: distinfo,v 1.6 2005/08/07 05:13:03 jeremy-c-reed Exp $
 
-SHA1 (xproto-6.6.2.tar.bz2) = f8f82255af3b15bdc5e9766eeebf8d696b8d8215
-Size (xproto-6.6.2.tar.bz2) = 86759 bytes
+SHA1 (xproto-7.0.tar.bz2) = b6b516b0e761f76a398a785ed36e53d9f91d5410
+RMD160 (xproto-7.0.tar.bz2) = be01261ccbfdfeb560951b7774c47fbe7dd8de9f
+Size (xproto-7.0.tar.bz2) = 103510 bytes