diff --git a/devel/concurrencykit/Makefile b/devel/concurrencykit/Makefile
index 6466ef74335b..2f4feab3608c 100644
--- a/devel/concurrencykit/Makefile
+++ b/devel/concurrencykit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	concurrencykit
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://concurrencykit.org/releases/ \
 		http://repnop.org/releases/
@@ -13,10 +14,21 @@ COMMENT=	Lock-free data structures for high performance concurrent systems
 
 LICENSE=	BSD2CLAUSE
 
+OPTIONS_DEFINE=	RTM VMAPACK
+OPTIONS_DEFAULT=RTM VMAPACK
+
+RTM_DESC=	Restricted Transactional Memory (x86_64 only)
+VMAPACK_DESC=	Enable pointer packing
+
+RTM_CONFIGURE_ON=	--enable-rtm
+VMAPACK_CONFIGURE_ON=	--enable-pointer-packing
+
 USES=		pkgconfig
 USE_LDCONFIG=	yes
+HAS_CONFIGURE=	yes
+
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
 
-GNU_CONFIGURE=	yes
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 post-extract: