diff --git a/devel/cjose/DESCR b/devel/cjose/DESCR
new file mode 100644
index 0000000000000..c652916e40b58
--- /dev/null
+++ b/devel/cjose/DESCR
@@ -0,0 +1,2 @@
+cjose
+Implementation of JOSE for C/C++
diff --git a/devel/cjose/Makefile b/devel/cjose/Makefile
new file mode 100644
index 0000000000000..c071a2999eae2
--- /dev/null
+++ b/devel/cjose/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.21 2018/08/15 13:55:00 ryoon Exp $
+
+DISTNAME=	cjose-0.6.1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=cisco/}
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+GITHUB_PROJECT=	cjose
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+#HOMEPAGE=	https://github.org/cisco/cjose
+COMMENT=	C library implementing the Javascript Object Signing and Encryption (JOSE)
+LICENSE=	MIT	
+
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-openssl=/opt/local --prefix=/opt/local --with-jansson=/opt/local
+USE_LIBTOOL=		YES
+USE_MULTIARCH=		lib
+USE_PKGLOCALEDIR=	YES
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
+
diff --git a/devel/cjose/PLIST b/devel/cjose/PLIST
new file mode 100644
index 0000000000000..cc6f840054d39
--- /dev/null
+++ b/devel/cjose/PLIST
@@ -0,0 +1,12 @@
+@comment $NetBSD$
+include/cjose/base64.h
+include/cjose/cjose.h
+include/cjose/error.h
+include/cjose/header.h
+include/cjose/jwe.h
+include/cjose/jwk.h
+include/cjose/jws.h
+include/cjose/util.h
+include/cjose/version.h
+lib/libcjose.la
+lib/pkgconfig/cjose.pc
diff --git a/devel/cjose/buildlink3.mk b/devel/cjose/buildlink3.mk
new file mode 100644
index 0000000000000..4fdabfbb5a49b
--- /dev/null
+++ b/devel/cjose/buildlink3.mk
@@ -0,0 +1,32 @@
+# $NetBSD$
+# XXX
+# XXX This file was created automatically using createbuildlink-3.17.
+# XXX After this file has been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed.  Please do not commit
+# XXX unverified buildlink3.mk files.
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX	BUILDLINK_DEPMETHOD.cjose?=	build
+
+BUILDLINK_TREE+=	cjose
+
+.if !defined(CJOSE_BUILDLINK3_MK)
+CJOSE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.cjose+=	cjose>=0.6.1
+BUILDLINK_PKGSRCDIR.cjose?=	../../devel/cjose
+
+# XXX
+# XXX Uncomment and keep only the buildlink3 lines below which are directly
+# XXX needed for dependencies to compile, link, and run.  If this package
+# XXX provides a wrappered API or otherwise does not expose the APIs of the
+# XXX buildlink3 lines below to dependencies, remove them.
+# XXX
+.include "../../textproc/jansson/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.endif	# CJOSE_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-cjose
+
diff --git a/devel/cjose/distinfo b/devel/cjose/distinfo
new file mode 100644
index 0000000000000..5f165af2dabf0
--- /dev/null
+++ b/devel/cjose/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.8 2018/08/15 13:55:00 ryoon Exp $
+
+SHA1 (cjose-0.6.1.tar.gz) = 0dd6efca729f1190f66855523c3920c3f7ddd482
+RMD160 (cjose-0.6.1.tar.gz) = 653323af3933dd622689815c3e11a102b23808c9
+SHA512 (cjose-0.6.1.tar.gz) = 7ae67a6d19591b3d19b888270ec0ca17df399bea117e42686fc1de39b3741ed9a8816f96d33d090687c49c3123cdc95430a781835a525a02d22561ebf5aaa653
+Size (cjose-0.6.1.tar.gz) = 1586963 bytes
+
diff --git a/www/ap-auth-openidc/DESCR b/www/ap-auth-openidc/DESCR
new file mode 100644
index 0000000000000..d1adbcc58935d
--- /dev/null
+++ b/www/ap-auth-openidc/DESCR
@@ -0,0 +1,4 @@
+mod_auth_openidc
+mod_auth_openidc is an authentication/authorization module for the 
+Apache 2.x HTTP server that functions as an OpenID Connect Relying 
+Party, authenticating users against an OpenID Connect Provider.
diff --git a/www/ap-auth-openidc/Makefile b/www/ap-auth-openidc/Makefile
new file mode 100644
index 0000000000000..6527fdba37d9a
--- /dev/null
+++ b/www/ap-auth-openidc/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.7 2018/12/13 19:52:24 adam Exp $
+
+DISTNAME=	mod_auth_openidc-2.4.0
+PKGNAME=	${DISTNAME:S/mod/${APACHE_PKG_PREFIX}/:S/_/-/g}
+PKGREVISION=	5
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_GITHUB:=zmartzone/}
+GITHUB_PROJECT=	mod_auth_openidc
+GITHUB_TYPE=	release
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+
+HOMEPAGE=	https://github.com/zmartzone/mod_auth_openidc
+COMMENT=	OpenID Connect Relying Party implementation for Apache HTTP Server 2.x
+LICENSE=	apache-2.0
+
+DEPEND+=	devel/cjose
+DEPEND+=	textproc/jansson
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-apxs2=${APXS}
+USE_TOOLS+=		gmake
+USE_TOOLS+=		pkg-config
+
+APACHE_MODULE=		yes
+
+INSTALLATION_DIRS+=	lib/httpd
+
+do-install:
+	${INSTALL_LIB} ${WRKSRC}/src/.libs/mod_auth_openidc.so ${DESTDIR}${PREFIX}/lib/httpd
+
+.include "../../mk/apache.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
+.include "../../devel/cjose/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-openidc/PLIST b/www/ap-auth-openidc/PLIST
new file mode 100644
index 0000000000000..4ce909d5bb161
--- /dev/null
+++ b/www/ap-auth-openidc/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+lib/httpd/mod_auth_openidc.so
diff --git a/www/ap-auth-openidc/distinfo b/www/ap-auth-openidc/distinfo
new file mode 100644
index 0000000000000..0bb007a32a8de
--- /dev/null
+++ b/www/ap-auth-openidc/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+SHA1 (mod_auth_openidc-2.4.0.tar.gz) = b757ce48111e807000c6b2588c1acd4a872fa3ac
+RMD160 (mod_auth_openidc-2.4.0.tar.gz) = e901576fd4815f239d0ecb1f4f276dcb088bf754
+SHA512 (mod_auth_openidc-2.4.0.tar.gz) = 9e1f3d05bb7d3c2ea4606a989da6a02ead2226fb58997730255aa92d0e878e478b87ea959d12055305041b4f0808703654f47a2c56e3adfcaa16d7fbfe86241d
+Size (mod_auth_openidc-2.4.0.tar.gz) = 269836 bytes
+SHA1 (patch-configure) = c5f9cb18f0a2263a7df7323759993bafc74b99f9
diff --git a/www/ap-auth-openidc/patches/patch-configure b/www/ap-auth-openidc/patches/patch-configure
new file mode 100644
index 0000000000000..bc8dae03f4ce9
--- /dev/null
+++ b/www/ap-auth-openidc/patches/patch-configure
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- configure.orig	2019-08-22 15:00:46.000000000 +0000
++++ configure
+@@ -4128,7 +4128,7 @@ fi
+
+ case "$with_hiredis" in #(
+   yes) :
+-    if test "$HIREDIS_LIBS" == ""; then
++    if test "$HIREDIS_LIBS" = ""; then
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hiredis" >&5
+ $as_echo_n "checking for hiredis... " >&6; }