diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile
index 2562d5c7620f..2d96d6c665b9 100644
--- a/x11-wm/xcompmgr/Makefile
+++ b/x11-wm/xcompmgr/Makefile
@@ -1,16 +1,17 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xcompmgr
 PORTVERSION=	1.1.7
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Sample X compositing manager
 
 XORG_CAT=	app
-USE_XORG=	x11 xcomposite xfixes xdamage xrender
+USE_XORG=	x11 xcomposite xext xfixes xdamage xrender
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xcompmgr/files/patch-xcompmgr.c b/x11-wm/xcompmgr/files/patch-xcompmgr.c
new file mode 100644
index 000000000000..91f2ad186da5
--- /dev/null
+++ b/x11-wm/xcompmgr/files/patch-xcompmgr.c
@@ -0,0 +1,28 @@
+--- xcompmgr.c.orig	2015-04-17 05:56:17 UTC
++++ xcompmgr.c
+@@ -1028,7 +1028,6 @@ paint_all (Display *dpy, XserverRegion region)
+ 	{
+ 	    w->borderClip = XFixesCreateRegion (dpy, NULL, 0);
+ 	    XFixesCopyRegion (dpy, w->borderClip, region);
+-	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
+ 	}
+ 	w->prev_trans = t;
+ 	t = w;
+@@ -1080,6 +1079,8 @@ paint_all (Display *dpy, XserverRegion region)
+ 	if (w->mode == WINDOW_TRANS)
+ 	{
+ 	    int	x, y, wid, hei;
++	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
++	    XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip);
+ #if HAS_NAME_WINDOW_PIXMAP
+ 	    x = w->a.x;
+ 	    y = w->a.y;
+@@ -1099,6 +1100,8 @@ paint_all (Display *dpy, XserverRegion region)
+ 	else if (w->mode == WINDOW_ARGB)
+ 	{
+ 	    int	x, y, wid, hei;
++	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
++	    XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip);
+ #if HAS_NAME_WINDOW_PIXMAP
+ 	    x = w->a.x;
+ 	    y = w->a.y;