diff --git a/sysutils/fleetctl/Makefile b/sysutils/fleetctl/Makefile
new file mode 100644
index 00000000000..29fd127f0a8
--- /dev/null
+++ b/sysutils/fleetctl/Makefile
@@ -0,0 +1,32 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2016/09/08 17:12:01 jasper Exp $
+
+COMMENT =		controller for fleet, the distributed init system
+
+GH_PROJECT =		fleet
+GH_ACCOUNT =		coreos
+GH_TAGNAME =		v0.11.8
+
+CATEGORIES =		sysutils
+
+MAINTAINER =		Jasper Lievisse Adriaanse <jasper@openbsd.org>
+
+# Apache2
+PERMIT_PACKAGE_CDROM =	Yes
+
+MODULES =		lang/go
+MODGO_TYPE =		bin
+
+BUILD_DEPENDS =		shells/bash
+
+NO_TEST =		Yes
+
+do-build:
+	cd ${WRKSRC} && ${SHELL} build
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/fleetctl ${PREFIX}/bin/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fleetctl/
+	cd ${WRKSRC}/Documentation && umask 022 && pax -rw . \
+		${PREFIX}/share/doc/fleetctl/
+
+.include <bsd.port.mk>
diff --git a/sysutils/fleetctl/distinfo b/sysutils/fleetctl/distinfo
new file mode 100644
index 00000000000..4d8b750e79d
--- /dev/null
+++ b/sysutils/fleetctl/distinfo
@@ -0,0 +1,2 @@
+SHA256 (fleet-0.11.8.tar.gz) = IvL0DBwpOFBLMenbtU6261RWlFik3/5eACDpF6Xh9m8=
+SIZE (fleet-0.11.8.tar.gz) = 443257
diff --git a/sysutils/fleetctl/patches/patch-build b/sysutils/fleetctl/patches/patch-build
new file mode 100644
index 00000000000..6d46ddae48b
--- /dev/null
+++ b/sysutils/fleetctl/patches/patch-build
@@ -0,0 +1,9 @@
+$OpenBSD: patch-build,v 1.1.1.1 2016/09/08 17:12:01 jasper Exp $
+--- build.orig	Thu Sep  8 14:21:05 2016
++++ build	Thu Sep  8 14:21:12 2016
+@@ -21,4 +21,4 @@ else
+ fi
+ 
+ echo "Building fleetctl..."
+-CGO_ENABLED=0 go build -o bin/fleetctl -a -installsuffix netgo -ldflags '-s' ${REPO_PATH}/fleetctl
++CGO_ENABLED=0 go build -x -o bin/fleetctl -a -installsuffix netgo -ldflags '-s' ${REPO_PATH}/fleetctl
diff --git a/sysutils/fleetctl/pkg/DESCR b/sysutils/fleetctl/pkg/DESCR
new file mode 100644
index 00000000000..8be5b6baedd
--- /dev/null
+++ b/sysutils/fleetctl/pkg/DESCR
@@ -0,0 +1,2 @@
+fleetctl is a command-line interface to fleet, the cluster-wide CoreOS
+init system.
diff --git a/sysutils/fleetctl/pkg/PLIST b/sysutils/fleetctl/pkg/PLIST
new file mode 100644
index 00000000000..9869ec85865
--- /dev/null
+++ b/sysutils/fleetctl/pkg/PLIST
@@ -0,0 +1,17 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2016/09/08 17:12:01 jasper Exp $
+@bin bin/fleetctl
+share/doc/fleetctl/
+share/doc/fleetctl/api-v1-alpha.md
+share/doc/fleetctl/api-v1.md
+share/doc/fleetctl/architecture.md
+share/doc/fleetctl/deployment-and-configuration.md
+share/doc/fleetctl/examples/
+share/doc/fleetctl/examples/api.py
+share/doc/fleetctl/examples/example-deployment.md
+share/doc/fleetctl/examples/img/
+share/doc/fleetctl/examples/img/subgun.png
+share/doc/fleetctl/examples/service-discovery.md
+share/doc/fleetctl/rkt_guide.md
+share/doc/fleetctl/states.md
+share/doc/fleetctl/unit-files-and-scheduling.md
+share/doc/fleetctl/using-the-client.md