Index: sysutils/docker-freebsd/Makefile
===================================================================
--- sysutils/docker-freebsd/Makefile
+++ sysutils/docker-freebsd/Makefile
@@ -2,36 +2,52 @@
 # $FreeBSD$
 
 PORTNAME=	docker-freebsd
-PORTVERSION=	20150625
-PORTREVISION=	1
+PORTVERSION=	g20170907
+PORTEPOCH=	1
 CATEGORIES=	sysutils
 
-MAINTAINER=	amutu@amutu.com
+MAINTAINER=	lifanov@FreeBSD.org
 COMMENT=	Docker containment system
 
 LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${GO_WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go>=1.4:lang/go \
-		bash:shells/bash \
-		sqlite3:databases/sqlite3
-RUN_DEPENDS=	go>=1.4:lang/go \
-		bash:shells/bash \
-		sqlite3:databases/sqlite3
+BUILD_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	kvasdopil
+USES=		go gmake
+
+USE_GITHUB=	nodefault
+GH_ACCOUNT=	freebsd-docker
 GH_PROJECT=	docker
-GH_TAGNAME=	582db78
+GH_TAGNAME=	52d67c9
 
-PLIST_FILES=	bin/docker
+GH_TUPLE=	freebsd-docker:docker:52d67c9:docker/src/github.com/docker/docker \
+		freebsd-docker:containerd:00a99ef:containerd/src/github.com/containerd/containerd \
+		freebsd-docker:libnetwork:acb2447:libnetwork/src/github.com/docker/libnetwork \
+		freebsd-docker:runc:9c2d8d1:runc/src/github.com/runc/runc \
+		krallin:tini:v0.16.1:tini/src/github.com/krallin/tini
+
+PLIST_FILES=	bin/docker \
+		bin/dockerd \
+		bin/docker-containerd \
+		bin/docker-containerd-ctr \
+		bin/docker-containerd-shim \
+		bin/docker-proxy
 USE_RC_SUBR=	docker
 
+GO_PKGNAME=	github.com/${GH_PROJECT}/${GH_PROJECT}
+SSP_UNSAFE=	yes
+
+post-extract:
+	${LN} -sf ${WRKSRC}/src ${WRKDIR}
+
 do-build:
-	@cd ${WRKSRC} && export AUTO_GOPATH=1 && export DOCKER_GITCOMMIT=${GH_TAGNAME} && ./hack/make.sh binary
+	@cd ${GO_WRKSRC} && export DOCKER_GITCOMMIT=${GH_TAGNAME} && ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -f Makefile.freebsd binary
 
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bundles/latest/binary/docker ${STAGEDIR}${PREFIX}/bin/
+post-install:
+.for f in ${PLIST_FILES}
+	${INSTALL_PROGRAM} ${GO_WRKSRC}/bundles/${f} ${STAGEDIR}${PREFIX}/bin
+.endfor
 
 .include <bsd.port.mk>
Index: sysutils/docker-freebsd/distinfo
===================================================================
--- sysutils/docker-freebsd/distinfo
+++ sysutils/docker-freebsd/distinfo
@@ -1,2 +1,13 @@
-SHA256 (kvasdopil-docker-20150625-582db78_GH0.tar.gz) = a750d344af4af3d30b1a3373f382ab597a2a7aa4a0bb5c22d650d0c5cc9ac506
-SIZE (kvasdopil-docker-20150625-582db78_GH0.tar.gz) = 7292884
+TIMESTAMP = 1504806100
+SHA256 (freebsd-docker-docker-g20170907-52d67c9_GH0.tar.gz) = b58df6102e4a7885a731472cab9239f985908b2377d0774206315f61df91399c
+SIZE (freebsd-docker-docker-g20170907-52d67c9_GH0.tar.gz) = 7181018
+SHA256 (freebsd-docker-docker-52d67c9_GH0.tar.gz) = b58df6102e4a7885a731472cab9239f985908b2377d0774206315f61df91399c
+SIZE (freebsd-docker-docker-52d67c9_GH0.tar.gz) = 7181018
+SHA256 (freebsd-docker-containerd-00a99ef_GH0.tar.gz) = 98c3b021b56521518049ddc65b9a895ebab21bcd33ed37e86e1e45766c290dfd
+SIZE (freebsd-docker-containerd-00a99ef_GH0.tar.gz) = 1231469
+SHA256 (freebsd-docker-libnetwork-acb2447_GH0.tar.gz) = 4c9ae300c414eba96203f7e797652ee4118820ca6d0e8fbe58698bd3cd0cd8c5
+SIZE (freebsd-docker-libnetwork-acb2447_GH0.tar.gz) = 2407383
+SHA256 (freebsd-docker-runc-9c2d8d1_GH0.tar.gz) = 567c2991ad8933c8913b151e8cf0eb09ac2fb547384dcbc7dd31b4a0c2a819a7
+SIZE (freebsd-docker-runc-9c2d8d1_GH0.tar.gz) = 561862
+SHA256 (krallin-tini-v0.16.1_GH0.tar.gz) = c2b7fe2fb92e71911d06b7571b53d4e7e8985b34efe2a599670b070b000c8dbe
+SIZE (krallin-tini-v0.16.1_GH0.tar.gz) = 29641