Index: head/devel/etcd/Makefile
===================================================================
--- head/devel/etcd/Makefile	(revision 406810)
+++ head/devel/etcd/Makefile	(revision 406811)
@@ -1,42 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	etcd
-PORTVERSION=	0.4.6
+PORTVERSION=	2.2.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 
 MAINTAINER=	robak@FreeBSD.org
 COMMENT=	Highly-available key value store and service discovery
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
+CONFLICTS=	coreos-etcdctl-0.*
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	coreos
 
-PLIST_FILES=	bin/bench \
-		bin/etcd
-
+PLIST_FILES=	bin/etcd \
+		bin/etcdctl
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Install etcd README file
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$VER|${DISTVERSION}|' ${WRKSRC}/scripts/release-version
-	@${REINPLACE_CMD} -e '/VER=/d' ${WRKSRC}/scripts/release-version
-
 do-build:
 	cd ${WRKSRC}; ${SH} build
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/bench ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/etcd ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/etcdctl ${STAGEDIR}${PREFIX}/bin/
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/etcd/distinfo
===================================================================
--- head/devel/etcd/distinfo	(revision 406810)
+++ head/devel/etcd/distinfo	(revision 406811)
@@ -1,2 +1,2 @@
-SHA256 (coreos-etcd-v0.4.6_GH0.tar.gz) = 9a9c4c3bdbafad8ca83ce09001d71573fe1f7b58531615b20e8ea0b1339a47c4
-SIZE (coreos-etcd-v0.4.6_GH0.tar.gz) = 2901706
+SHA256 (coreos-etcd-v2.2.4_GH0.tar.gz) = 42a90cad608cf9bc5152abf06b00d7383efc569c35f0c7e88dac378caf5532f4
+SIZE (coreos-etcd-v2.2.4_GH0.tar.gz) = 1862334