Index: head/sysutils/docker/Makefile
===================================================================
--- head/sysutils/docker/Makefile	(revision 444647)
+++ head/sysutils/docker/Makefile	(revision 444648)
@@ -1,27 +1,28 @@
 # Created by: Nikolai Lifanov <lifanov@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=		docker
-PORTVERSION=		17.05.0
+PORTVERSION=		17.06.0
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-ce
 CATEGORIES=		sysutils
 
 MAINTAINER=		lifanov@FreeBSD.org
 COMMENT=		Open-source application container engine
 
 LICENSE=		APACHE20
-LICENSE_FILE=		${WRKSRC}/LICENSE
 
 PLIST_FILES=		bin/docker
 
 USE_GITHUB=		yes
-GH_ACCOUNT=		moby
-GH_PROJECT=		moby
+GH_PROJECT=		docker-ce
 
 USES=	go
 
-GO_PKGNAME=	github.com/${PORTNAME}/${PORTNAME}
-GO_TARGET=	github.com/${PORTNAME}/${PORTNAME}/cmd/docker
+GO_PKGNAME=	github.com/${PORTNAME}
+GO_TARGET=	${GO_PKGNAME}/cli/cmd/docker
+
+pre-build:
+		@${MV} ${GO_WRKSRC}/components/* ${GO_WRKSRC}/
 
 .include <bsd.port.mk>
Index: head/sysutils/docker/distinfo
===================================================================
--- head/sysutils/docker/distinfo	(revision 444647)
+++ head/sysutils/docker/distinfo	(revision 444648)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494354768
-SHA256 (moby-moby-v17.05.0-ce_GH0.tar.gz) = 4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121
-SIZE (moby-moby-v17.05.0-ce_GH0.tar.gz) = 7166613
+TIMESTAMP = 1498743860
+SHA256 (docker-docker-ce-v17.06.0-ce_GH0.tar.gz) = 60c2541327a27b03d3a7eaea713d89e8e03a2585f00033c6c662fc60eade57ab
+SIZE (docker-docker-ce-v17.06.0-ce_GH0.tar.gz) = 10397351