diff --git a/misc/unclutter/Makefile b/misc/unclutter/Makefile
index f3ce2ddfacb5..ebd0a31c6fd3 100644
--- a/misc/unclutter/Makefile
+++ b/misc/unclutter/Makefile
@@ -1,17 +1,22 @@
 PORTNAME=	unclutter
-PORTVERSION=	8
-PORTREVISION=	4
+DISTVERSION=	8
+PORTREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	XCONTRIB/utilities
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mce@FreeBSD.org
 COMMENT=	Remove idle cursor image from screen
 
-WRKSRC=		${WRKDIR}/unclutter
+LICENSE=	PD
+
 USES=		imake tar:Z xorg
-USE_XORG=	x11 xext
+USE_XORG=	x11 xext xorgproto
+
+CONFLICTS_INSTALL=	unclutter-xfixes
+
+WRKSRC=		${WRKDIR}/unclutter
 
 PLIST_FILES=	bin/unclutter \
 		share/man/man1/unclutter.1.gz
 
 .include <bsd.port.mk>