diff --git a/guest-oslogin/DESCR b/guest-oslogin/DESCR
new file mode 100644
index 0000000000..b3a30564d3
--- /dev/null
+++ b/guest-oslogin/DESCR
@@ -0,0 +1,18 @@
+The OS Login Guest Environment consists of the following main components:
+
+- Authorized Keys Command which provides SSH keys from the user's OS Login
+  profile to sshd for authenticating users at login.
+- NSS Modules which provide support for making OS Login user and group
+  information available to the system, using NSS (Name Service Switch)
+  functionality.
+- PAM Modules which provide authorization (and authentication if two-factor
+  support is enabled) support allowing the system to use Google Cloud IAM
+  permissions to control the ability to log into an instance or to perform
+  operations as root (via sudo).
+
+In addition to the main components, there are also the following utilities:
+
+- google_oslogin_control is a shell script for activating/deactivating the OS
+  Login components.
+- google_oslogin_nss_cache is a utility for updating the local user and group
+  cache.
diff --git a/guest-oslogin/Makefile b/guest-oslogin/Makefile
new file mode 100644
index 0000000000..1561f838e8
--- /dev/null
+++ b/guest-oslogin/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD$
+
+GITHUB_PROJECT=	guest-oslogin
+GITHUB_TAG=	4d53cc0ffdb
+DISTNAME=	guest-oslogin-20191023
+CATEGORIES=	wip sysutils
+MASTER_SITES=	${MASTER_SITE_GITHUB:=GoogleCloudPlatform/}
+EXTRACT_SUFX=	.zip
+
+MAINTAINER=	bsiegert@NetBSD.org
+HOMEPAGE=	https://github.com/GoogleCloudPlatform/guest-oslogin/
+COMMENT=	OS Login Guest Environment for Google Compute Engine
+LICENSE=	apache-2.0
+
+WRKSRC=		${WRKDIR}/guest-oslogin-4d53cc0ffdb5f11c3a29bc84db86b41cd9f87cb7
+USE_LANGUAGES=	c c++
+USE_TOOLS=	gmake
+
+.include "../../www/curl/buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/guest-oslogin/PLIST b/guest-oslogin/PLIST
new file mode 100644
index 0000000000..48d96a5493
--- /dev/null
+++ b/guest-oslogin/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD$
diff --git a/guest-oslogin/TODO b/guest-oslogin/TODO
new file mode 100644
index 0000000000..1d10ad1220
--- /dev/null
+++ b/guest-oslogin/TODO
@@ -0,0 +1,5 @@
+This is very much work in progress.
+
+- make this compile on NetBSD (NSS code seems fairly different)
+- add PLIST
+- submit needed patches upstream :)
diff --git a/guest-oslogin/distinfo b/guest-oslogin/distinfo
new file mode 100644
index 0000000000..af23cb59bb
--- /dev/null
+++ b/guest-oslogin/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+SHA1 (guest-oslogin-20191023-4d53cc0ffdb.zip) = fb9c244aba2644510e5847859734d78c409bb756
+RMD160 (guest-oslogin-20191023-4d53cc0ffdb.zip) = 13d40551f7245d08212867d44452b1eedf138dfb
+SHA512 (guest-oslogin-20191023-4d53cc0ffdb.zip) = 6a6fd366c71ae3fd7a89f8357d94872665e111d9272c3933da0b89cb5383a366f4a841577684344f2eb8554a143af816e6917784a4215eacd4adc78c4c0cf50a
+Size (guest-oslogin-20191023-4d53cc0ffdb.zip) = 60205 bytes
+SHA1 (patch-src_include_compat.h) = 04014ed64b8daa9c57fa23f4f28c18d7436aebd5
diff --git a/guest-oslogin/patches/patch-src_include_compat.h b/guest-oslogin/patches/patch-src_include_compat.h
new file mode 100644
index 0000000000..3306638f57
--- /dev/null
+++ b/guest-oslogin/patches/patch-src_include_compat.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Support NetBSD like FreeBSD
+
+--- src/include/compat.h.orig	2019-10-23 17:48:13.000000000 +0000
++++ src/include/compat.h
+@@ -15,7 +15,7 @@
+ #ifndef OSLOGIN_COMPAT_H
+ #define OSLOGIN_COMPAT_H
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ 
+ #include <nsswitch.h>
+