diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index 957316513e94..aa1fc49fccdb 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -1,21 +1,24 @@
-# New ports collection makefile for:	xcb
-# Date created:		1 August 1995
-# Whom:			jkh
-#
+# Created by: jkh
 # $FreeBSD$
-#
 
 PORTNAME=	xcb
 PORTVERSION=	2.4
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	http://oldhome.schmorp.de/marc/data/
+MASTER_SITES=	http://oldhome.schmorp.de/marc/data/ \
+		http://ftp.lyx.org/pub/pcg/marc/ \
+		http://fossies.org/unix/misc/old/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A tool for managing x11 cut-buffers
+COMMENT=	Tool for managing x11 cut-buffers
+
+LICENSE=	MIT
 
 USE_IMAKE=	yes
 USE_XORG=	ice sm x11 xaw xext xmu xt
+
 MAN1=		xcb.1
+PLIST_FILES=	bin/xcb \
+		lib/X11/app-defaults/Xcb
 
 .include <bsd.port.mk>
diff --git a/x11/xcb/pkg-descr b/x11/xcb/pkg-descr
index 53b903288347..46e15ae74277 100644
--- a/x11/xcb/pkg-descr
+++ b/x11/xcb/pkg-descr
@@ -13,4 +13,4 @@ used as holding pens to store and retrieve arbitrary data fragments,
 so any number of different pieces of data can be saved and recalled later.
 The program is designed primarily for use with textual data.
 
-WWW: http://www.goof.com/pcg/marc/xcb.html
+WWW: http://oldhome.schmorp.de/marc/xcb.html
diff --git a/x11/xcb/pkg-plist b/x11/xcb/pkg-plist
deleted file mode 100644
index 4514c7183817..000000000000
--- a/x11/xcb/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/xcb
-lib/X11/app-defaults/Xcb