diff --git a/MOVED b/MOVED
index f3e079915534..b28649e7d2b4 100644
--- a/MOVED
+++ b/MOVED
@@ -7681,3 +7681,4 @@ 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
diff --git a/sysutils/Makefile b/sysutils/Makefile
index d8a6039705f3..56dfba541ca3 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -201,7 +201,7 @@
     SUBDIR += djmount
     SUBDIR += dmg2img
     SUBDIR += dmidecode
-    SUBDIR += docker
+    SUBDIR += docker-freebsd
     SUBDIR += doinkd
     SUBDIR += dolly
     SUBDIR += downtime
diff --git a/sysutils/docker/Makefile b/sysutils/docker-freebsd/Makefile
similarity index 95%
rename from sysutils/docker/Makefile
rename to sysutils/docker-freebsd/Makefile
index 7fc20afa2e21..6204a0e3652a 100644
--- a/sysutils/docker/Makefile
+++ b/sysutils/docker-freebsd/Makefile
@@ -1,7 +1,7 @@
 # Created by: kmoore@FreeBSD.org
 # $FreeBSD$
 
-PORTNAME=	docker
+PORTNAME=	docker-freebsd
 PORTVERSION=	06252015
 CATEGORIES=	sysutils
 
@@ -21,6 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kvasdopil
+GH_PROJECT=	docker
 GH_TAGNAME=	582db78
 
 PLIST_FILES=	bin/docker
diff --git a/sysutils/docker/distinfo b/sysutils/docker-freebsd/distinfo
similarity index 100%
rename from sysutils/docker/distinfo
rename to sysutils/docker-freebsd/distinfo
diff --git a/sysutils/docker/files/docker.in b/sysutils/docker-freebsd/files/docker.in
similarity index 100%
rename from sysutils/docker/files/docker.in
rename to sysutils/docker-freebsd/files/docker.in
diff --git a/sysutils/docker/pkg-descr b/sysutils/docker-freebsd/pkg-descr
similarity index 100%
rename from sysutils/docker/pkg-descr
rename to sysutils/docker-freebsd/pkg-descr
diff --git a/sysutils/docker/pkg-message b/sysutils/docker-freebsd/pkg-message
similarity index 100%
rename from sysutils/docker/pkg-message
rename to sysutils/docker-freebsd/pkg-message