diff --git a/devel/ocaml-cppo/Makefile b/devel/ocaml-cppo/Makefile
index 8bfccf4bddcf..e97c49aa4d04 100644
--- a/devel/ocaml-cppo/Makefile
+++ b/devel/ocaml-cppo/Makefile
@@ -1,16 +1,21 @@
 # Created by: Michael Grunewald
 
 PORTNAME=	cppo
-PORTVERSION=	0.9.2
+PORTVERSION=	1.6.7
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
-MASTER_SITES=	http://martin.jambon.free.fr/
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple preprocessor for OCaml
 
-USES=		gmake
+BUILD_DEPENDS=	dune:devel/ocaml-dune \
+		ocamlbuild:devel/ocaml-ocamlbuild
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	ocaml-community
 USE_OCAML=	yes
-MAKE_JOBS_UNSAFE=	yes
+
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-cppo/distinfo b/devel/ocaml-cppo/distinfo
index 29197d4ea60f..e37e9ba6920c 100644
--- a/devel/ocaml-cppo/distinfo
+++ b/devel/ocaml-cppo/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cppo-0.9.2.tar.gz) = ee4693b16e82e0d7f9b955dc6d935c518958fdd87b8e9402cc54a52e6e03897f
-SIZE (cppo-0.9.2.tar.gz) = 20234
+TIMESTAMP = 1608568122
+SHA256 (ocaml-community-cppo-v1.6.7_GH0.tar.gz) = 05da2db9b9c923105c26ef303ff9802e819146d0130421ba5656b1a8739ec461
+SIZE (ocaml-community-cppo-v1.6.7_GH0.tar.gz) = 29032
diff --git a/devel/ocaml-cppo/files/patch-Makefile b/devel/ocaml-cppo/files/patch-Makefile
deleted file mode 100644
index 7f04017aee0b..000000000000
--- a/devel/ocaml-cppo/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	2014-07-10 23:43:16.837117715 +0800
-+++ Makefile	2014-07-10 23:43:35.518127751 +0800
-@@ -33,8 +33,8 @@ opt: $(ML)
- 	ocamlopt -o cppo -dtypes unix.cmxa $(ML)
- 
- install:
--	install -m 0755 cppo $(BINDIR) || \
--		install -m 0755 cppo.exe $(BINDIR)
-+	install -m 0755 cppo $(DESTDIR)$(BINDIR) || \
-+		install -m 0755 cppo.exe $(DESTDOR)$(BINDIR)
- 
- cppo_version.ml: Makefile
- 	echo 'let cppo_version = "$(VERSION)"' > cppo_version.ml
diff --git a/devel/ocaml-cppo/pkg-plist b/devel/ocaml-cppo/pkg-plist
index 854b89ab4f9b..a58ecee23530 100644
--- a/devel/ocaml-cppo/pkg-plist
+++ b/devel/ocaml-cppo/pkg-plist
@@ -1 +1,21 @@
 bin/cppo
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo/META
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo/dune-package
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo/opam
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/META
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.a
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cma
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxa
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxs
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/dune-package
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmi
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmt
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmti
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.cmx
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.ml
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/ocamlbuild_cppo.mli
+%%OCAML_SITELIBDIR%%:/usr/local/lib/ocaml/cppo_ocamlbuild/opam
+%%PORTDOCS%%share/doc/ocaml/cppo/LICENSE.md
+%%PORTDOCS%%share/doc/ocaml/cppo/README.md
+%%PORTDOCS%%share/doc/ocaml/cppo_ocamlbuild/LICENSE.md
+%%PORTDOCS%%share/doc/ocaml/cppo_ocamlbuild/README.md