--- Makefile.orig	2013-11-13 10:26:59.000000000 +0100
+++ Makefile	2013-11-13 10:27:06.000000000 +0100
@@ -3,7 +3,7 @@
 PORTNAME=	etcd
 PORTVERSION=	0.1.2
 CATEGORIES=	devel
-PKGNAMEPREFIX=	coreos
+PKGNAMEPREFIX=	coreos-
 
 MAINTAINER=	ports@robakdesign.com
 COMMENT=	Highly-available key value store and service discovery
@@ -21,8 +21,15 @@
 
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS ETCDCTL
 DOCS_DESC=	Install etcd README file
+ETCDCTL_DESC=	Install etcdctl commandline tool
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:METCDCTL}
+RUN_DEPENDS+=   etcdctl:${PORTSDIR}/devel/etcdctl
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$VER|${DISTVERSION}|' ${WRKSRC}/scripts/release-version