diff --git a/MOVED b/MOVED
index c463bb3dff65..2f3485b9ae6d 100644
--- a/MOVED
+++ b/MOVED
@@ -7649,7 +7649,6 @@ devel/erlang-ibrowse|www/erlang-ibrowse|2015-07-05|Move to www where it belongs
 multimedia/ffmpeg23|multimedia/ffmpeg|2015-07-05|Obsolete since recent upstream upgrade of main ffmpeg port. Use multimedia/ffmpeg instead
 multimedia/ffmpeg26|multimedia/ffmpeg|2015-07-05|Obsolete since recent upstream upgrade of main ffmpeg port. Use multimedia/ffmpeg instead
 x11/docker|x11/docker-tray|2015-07-06|Renamed
-sysutils/docker|sysutils/docker-freebsd|2015-07-07|Renamed
 graphics/fli2gif||2015-07-07|Has expired: No public distfiles
 net-im/tkabbur||2015-07-07|Has expired: Upstream development ceased since 2008
 www/mod_wsgi3|www/mod_wsgi4|2015-07-12|Renamed to reflect new version
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 0bbd8acbbd98..63a8801ef93c 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -235,6 +235,7 @@
     SUBDIR += djmount
     SUBDIR += dmg2img
     SUBDIR += dmidecode
+    SUBDIR += docker
     SUBDIR += docker-freebsd
     SUBDIR += doinkd
     SUBDIR += dolly
diff --git a/sysutils/docker/Makefile b/sysutils/docker/Makefile
new file mode 100644
index 000000000000..1a8de04a4900
--- /dev/null
+++ b/sysutils/docker/Makefile
@@ -0,0 +1,26 @@
+# Created by: Nikolai Lifanov <lifanov@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=		docker
+PORTVERSION=		17.03.0
+DISTVERSIONPREFIX=	v
+DISTVERSIONSUFFIX=	-ce
+CATEGORIES=		sysutils
+
+MAINTAINER=		lifanov@FreeBSD.org
+COMMENT=		Open-source application container engine
+
+LICENSE=		APACHE20
+
+PLIST_FILES=		bin/docker
+
+USE_GITHUB=		yes
+
+USES=	go
+
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_TARGET=	github.com/${GH_ACCOUNT}/${PORTNAME}/cmd/docker
+
+STRIP=		# stripping can break go binaries
+
+.include <bsd.port.mk>
diff --git a/sysutils/docker/distinfo b/sysutils/docker/distinfo
new file mode 100644
index 000000000000..ef5bce68e21d
--- /dev/null
+++ b/sysutils/docker/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1490113515
+SHA256 (docker-docker-v17.03.0-ce_GH0.tar.gz) = d8e91af5b2799cafac113a400d4db9c6abe01ae823f378d2f4d3d3e55e48eaf6
+SIZE (docker-docker-v17.03.0-ce_GH0.tar.gz) = 7769578
diff --git a/sysutils/docker/pkg-descr b/sysutils/docker/pkg-descr
new file mode 100644
index 000000000000..439c302f2917
--- /dev/null
+++ b/sysutils/docker/pkg-descr
@@ -0,0 +1,8 @@
+Docker is the world's leading software container platform. Developers use
+Docker to eliminate "works on my machine" problems when collaborating on code
+with co-workers. Operators use Docker to run and manage apps side-by-side in
+isolated containers to get better compute density. Enterprises use Docker to
+build agile software delivery pipelines to ship new features faster, more
+securely and with confidence for both Linux and Windows Server apps. 
+
+WWW: https://www.docker.com/
diff --git a/sysutils/docker/pkg-message b/sysutils/docker/pkg-message
new file mode 100644
index 000000000000..9af3fe6fd0e6
--- /dev/null
+++ b/sysutils/docker/pkg-message
@@ -0,0 +1,2 @@
+This port contains Docker client only.
+For Docker server support, install docker-machine.