Index: head/devel/Makefile
===================================================================
--- head/devel/Makefile
+++ head/devel/Makefile
@@ -270,6 +270,7 @@
     SUBDIR += clinfo
     SUBDIR += clisp-hyperspec
     SUBDIR += clojure-cider
+    SUBDIR += cloudabi
     SUBDIR += cloudabi-binutils-aarch64
     SUBDIR += cloudabi-binutils-x86_64
     SUBDIR += cloudabi-toolchain
Index: head/devel/cloudabi/Makefile
===================================================================
--- head/devel/cloudabi/Makefile
+++ head/devel/cloudabi/Makefile
@@ -0,0 +1,22 @@
+# Created by: Ed Schouten <ed@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	cloudabi
+PORTVERSION=	0.6
+DISTVERSIONPREFIX=v
+CATEGORIES=	devel
+
+MAINTAINER=	ed@FreeBSD.org
+COMMENT=	Constants, types and data structures used by CloudABI
+
+LICENSE=	BSD2CLAUSE
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	NuxiNL
+
+NO_BUILD=	yes
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/headers/* ${STAGEDIR}${PREFIX}/include/
+
+.include <bsd.port.mk>
Index: head/devel/cloudabi/distinfo
===================================================================
--- head/devel/cloudabi/distinfo
+++ head/devel/cloudabi/distinfo
@@ -0,0 +1,2 @@
+SHA256 (NuxiNL-cloudabi-v0.6_GH0.tar.gz) = 2b3e1ad30e4af3d2cb5560fb25d2bc9d328db7d1ad1f648dbd4bb8dbb3effb50
+SIZE (NuxiNL-cloudabi-v0.6_GH0.tar.gz) = 111250
Index: head/devel/cloudabi/pkg-descr
===================================================================
--- head/devel/cloudabi/pkg-descr
+++ head/devel/cloudabi/pkg-descr
@@ -0,0 +1,11 @@
+Nuxi CloudABI is an application binary interface for UNIX-like operating
+systems built around the concept of capability-based security. In a
+nutshell, it means that you can run processes directly on top of a UNIX
+kernel while keeping complete control over the actions the process is
+allowed to perform.
+
+This port installs a set of header files that contain the definitions
+that describe the ABI itself: all of the constants, types, structures
+and system calls.
+
+WWW: https://github.com/NuxiNL/cloudabi
Index: head/devel/cloudabi/pkg-plist
===================================================================
--- head/devel/cloudabi/pkg-plist
+++ head/devel/cloudabi/pkg-plist
@@ -0,0 +1,10 @@
+include/cloudabi32_types.h
+include/cloudabi64_types.h
+include/cloudabi_syscalls.h
+include/cloudabi_syscalls_info.h
+include/cloudabi_syscalls_native.h
+include/cloudabi_syscalls_native_aarch64.h
+include/cloudabi_syscalls_native_x86_64.h
+include/cloudabi_syscalls_struct.h
+include/cloudabi_types.h
+include/cloudabi_types_common.h
Index: head/sysutils/cloudabi-utils/Makefile
===================================================================
--- head/sysutils/cloudabi-utils/Makefile
+++ head/sysutils/cloudabi-utils/Makefile
@@ -2,17 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	cloudabi-utils
-PORTVERSION=	0.7
+PORTVERSION=	0.9
+DISTVERSIONPREFIX=v
 CATEGORIES=	sysutils
-MASTER_SITES=	https://nuxi.nl/distfiles/cloudabi-utils/
 
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	Utilities for running CloudABI programs
 
 LICENSE=	BSD2CLAUSE
 
+BUILD_DEPENDS=	${LOCALBASE}/include/cloudabi_types.h:devel/cloudabi
 LIB_DEPENDS=	libyaml.so:textproc/libyaml
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	NuxiNL
+
 ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	CloudABI has not yet been ported to other architectures
 
@@ -20,6 +24,7 @@
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=man
+CFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
Index: head/sysutils/cloudabi-utils/distinfo
===================================================================
--- head/sysutils/cloudabi-utils/distinfo
+++ head/sysutils/cloudabi-utils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cloudabi-utils-0.7.tar.xz) = 193b115ca195ec56c24679916d7b38f8566a0a49b26b057e1567f1bbfb9ae5a2
-SIZE (cloudabi-utils-0.7.tar.xz) = 24496
+SHA256 (NuxiNL-cloudabi-utils-v0.9_GH0.tar.gz) = 947346fc15b14bd338613c292897ed9e597d9e1ed5469b64c92962bb9c90635d
+SIZE (NuxiNL-cloudabi-utils-v0.9_GH0.tar.gz) = 2044153
Index: head/sysutils/cloudabi-utils/pkg-plist
===================================================================
--- head/sysutils/cloudabi-utils/pkg-plist
+++ head/sysutils/cloudabi-utils/pkg-plist
@@ -2,6 +2,6 @@
 include/cloudabi/argdata.h
 include/cloudabi/program.h
 lib/libcloudabi.so
-lib/libcloudabi.so.0
+lib/libcloudabi.so.1
 libexec/cloudabi-reexec
 man/man1/cloudabi-run.1.gz