diff --git a/openbsd-faq/Makefile b/openbsd-faq/Makefile
new file mode 100644
index 0000000..4ff40ba
--- /dev/null
+++ b/openbsd-faq/Makefile
@@ -0,0 +1,33 @@
+COMMENT =	OpenBSD FAQ offline
+
+GH_ACCOUNT =	OpenBSD
+GH_PROJECT =	www
+GH_COMMIT =	104daa6522e05f7c1780adab559ce5e7cd999d44
+DISTNAME =	openbsd-faq-20231229
+PKGNAME =	${DISTNAME}
+
+CATEGORIES =	books
+
+HOMEPAGE =	https://www.openbsd.org/faq
+
+# no maintainer OK needed to update
+MAINTAINER =	Stefan Hagen <sh+ports@codevoid.de>
+
+# ISC License
+PERMIT_PACKAGE =	Yes
+
+RUN_DEPENDS =	www/lynx
+
+NO_BUILD =	Yes
+NO_TEST =	Yes
+
+DOCDIR =	${PREFIX}/share/doc/openbsd-faq
+
+do-install:
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	cp -r ${WRKSRC}/faq/* ${DOCDIR}/
+	echo "#!/bin/sh" > ${PREFIX}/bin/openbsd-faq
+	echo "lynx ${DOCDIR}/index.html" >> ${PREFIX}/bin/openbsd-faq
+	chmod +x ${PREFIX}/bin/openbsd-faq
+
+.include <bsd.port.mk>
diff --git a/openbsd-faq/distinfo b/openbsd-faq/distinfo
new file mode 100644
index 0000000..8b3c1c2
--- /dev/null
+++ b/openbsd-faq/distinfo
@@ -0,0 +1,2 @@
+SHA256 (openbsd-faq-20231229-104daa65.tar.gz) = QzWL9qb4PeN25dXN+YtuKFwgIXMA+TbXcBAqi37E+JQ=
+SIZE (openbsd-faq-20231229-104daa65.tar.gz) = 609669270
diff --git a/openbsd-faq/pkg/DESCR b/openbsd-faq/pkg/DESCR
new file mode 100644
index 0000000..114de80
--- /dev/null
+++ b/openbsd-faq/pkg/DESCR
@@ -0,0 +1,4 @@
+This package contains the OpenBSD FAQ. An up to date version is
+available online.
+
+Hyperlinks pointing to online resource will not work while offline.
diff --git a/openbsd-faq/pkg/PLIST b/openbsd-faq/pkg/PLIST
new file mode 100644
index 0000000..15780b9
--- /dev/null
+++ b/openbsd-faq/pkg/PLIST
@@ -0,0 +1,97 @@
+bin/openbsd-faq
+share/doc/openbsd-faq/
+share/doc/openbsd-faq/current.html
+share/doc/openbsd-faq/faq1.html
+share/doc/openbsd-faq/faq10.html
+share/doc/openbsd-faq/faq11.html
+share/doc/openbsd-faq/faq13.html
+share/doc/openbsd-faq/faq14.html
+share/doc/openbsd-faq/faq15.html
+share/doc/openbsd-faq/faq16.html
+share/doc/openbsd-faq/faq17.html
+share/doc/openbsd-faq/faq4.html
+share/doc/openbsd-faq/faq5.html
+share/doc/openbsd-faq/faq6.html
+share/doc/openbsd-faq/faq7.html
+share/doc/openbsd-faq/index.html
+share/doc/openbsd-faq/pf/
+share/doc/openbsd-faq/pf/anchors.html
+share/doc/openbsd-faq/pf/authpf.html
+share/doc/openbsd-faq/pf/carp.html
+share/doc/openbsd-faq/pf/config.html
+share/doc/openbsd-faq/pf/example1.html
+share/doc/openbsd-faq/pf/filter.html
+share/doc/openbsd-faq/pf/ftp.html
+share/doc/openbsd-faq/pf/index.html
+share/doc/openbsd-faq/pf/logging.html
+share/doc/openbsd-faq/pf/macros.html
+share/doc/openbsd-faq/pf/nat.html
+share/doc/openbsd-faq/pf/options.html
+share/doc/openbsd-faq/pf/perf.html
+share/doc/openbsd-faq/pf/pools.html
+share/doc/openbsd-faq/pf/rdr.html
+share/doc/openbsd-faq/pf/shortcuts.html
+share/doc/openbsd-faq/pf/tables.html
+share/doc/openbsd-faq/pf/tagging.html
+share/doc/openbsd-faq/ports/
+share/doc/openbsd-faq/ports/differences.html
+share/doc/openbsd-faq/ports/guide.html
+share/doc/openbsd-faq/ports/index.html
+share/doc/openbsd-faq/ports/ports.html
+share/doc/openbsd-faq/ports/specialtopics.html
+share/doc/openbsd-faq/ports/testing.html
+share/doc/openbsd-faq/upgrade35.html
+share/doc/openbsd-faq/upgrade36.html
+share/doc/openbsd-faq/upgrade37.html
+share/doc/openbsd-faq/upgrade38.html
+share/doc/openbsd-faq/upgrade38.patch
+share/doc/openbsd-faq/upgrade39.html
+share/doc/openbsd-faq/upgrade39.patch
+share/doc/openbsd-faq/upgrade40.html
+share/doc/openbsd-faq/upgrade40.patch
+share/doc/openbsd-faq/upgrade41.html
+share/doc/openbsd-faq/upgrade41.patch
+share/doc/openbsd-faq/upgrade42.html
+share/doc/openbsd-faq/upgrade42.patch
+share/doc/openbsd-faq/upgrade43.html
+share/doc/openbsd-faq/upgrade43.patch
+share/doc/openbsd-faq/upgrade44.html
+share/doc/openbsd-faq/upgrade44.patch
+share/doc/openbsd-faq/upgrade45.html
+share/doc/openbsd-faq/upgrade45.patch
+share/doc/openbsd-faq/upgrade46.html
+share/doc/openbsd-faq/upgrade46.patch
+share/doc/openbsd-faq/upgrade47.html
+share/doc/openbsd-faq/upgrade47.patch
+share/doc/openbsd-faq/upgrade48.html
+share/doc/openbsd-faq/upgrade48.patch
+share/doc/openbsd-faq/upgrade49.html
+share/doc/openbsd-faq/upgrade49.patch
+share/doc/openbsd-faq/upgrade50.html
+share/doc/openbsd-faq/upgrade50.patch
+share/doc/openbsd-faq/upgrade51.html
+share/doc/openbsd-faq/upgrade51.patch
+share/doc/openbsd-faq/upgrade52.html
+share/doc/openbsd-faq/upgrade52.patch
+share/doc/openbsd-faq/upgrade53.html
+share/doc/openbsd-faq/upgrade54.html
+share/doc/openbsd-faq/upgrade55.html
+share/doc/openbsd-faq/upgrade56.html
+share/doc/openbsd-faq/upgrade57.html
+share/doc/openbsd-faq/upgrade58.html
+share/doc/openbsd-faq/upgrade59.html
+share/doc/openbsd-faq/upgrade60.html
+share/doc/openbsd-faq/upgrade61.html
+share/doc/openbsd-faq/upgrade62.html
+share/doc/openbsd-faq/upgrade63.html
+share/doc/openbsd-faq/upgrade64.html
+share/doc/openbsd-faq/upgrade65.html
+share/doc/openbsd-faq/upgrade66.html
+share/doc/openbsd-faq/upgrade67.html
+share/doc/openbsd-faq/upgrade68.html
+share/doc/openbsd-faq/upgrade69.html
+share/doc/openbsd-faq/upgrade70.html
+share/doc/openbsd-faq/upgrade71.html
+share/doc/openbsd-faq/upgrade72.html
+share/doc/openbsd-faq/upgrade73.html
+share/doc/openbsd-faq/upgrade74.html