diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54671ae32..8c8b3e5f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+- Makefile: Use phpDocumentor v3.4 for the Framework docs (#9313)
+
+## Release 1.6.6
+
 - Fix regression in handling LDAP search_fields configuration parameter (#9210)
 - Enigma: Fix finding of a private key when decrypting a message using GnuPG v2.3
 - Fix page jump menu flickering on click (#9196)
diff --git a/Makefile b/Makefile
index 471b356f6..da4a4e48d 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,8 @@ dependent: roundcubemail-git
  
 framework: roundcubemail-git /tmp/phpDocumentor.phar
 	cp -r roundcubemail-git/program/lib/Roundcube roundcube-framework-$(VERSION)
-	(cd roundcube-framework-$(VERSION); php /tmp/phpDocumentor.phar -d . -t ./doc --title="Roundcube Framework" --defaultpackagename="Framework" --template="clean")
-	(cd roundcube-framework-$(VERSION); rm -rf doc/phpdoc-cache* .phpdoc)
+	(cd roundcube-framework-$(VERSION); php /tmp/phpDocumentor.phar run -d . -t ./doc --title="Roundcube Framework" --defaultpackagename="Framework")
+	(cd roundcube-framework-$(VERSION); rm -rf .phpdoc)
 	tar czf roundcube-framework-$(VERSION).tar.gz roundcube-framework-$(VERSION)
 	rm -rf roundcube-framework-$(VERSION)