diff --git a/dev-libs/cgicc/Manifest b/dev-libs/cgicc/Manifest
index 0c703b55dc..edf5a1703d 100644
--- a/dev-libs/cgicc/Manifest
+++ b/dev-libs/cgicc/Manifest
@@ -1 +1,2 @@
 DIST cgicc-3.2.19.tar.gz 2456040 BLAKE2B 32c1d8e55a61dad12e489c4170ab7ef593f0e10db9e2eba4491dc0d4cce450414cd54c3f81395c6a132d074f0f8573cec8459168947354399c0b0dc9de7902bb SHA512 c361923cf3ac876bc3fc94dffd040d2be7cd44751d8534f4cfa3545e9f58a8ec35ebcd902a8ce6a19da0efe52db67506d8b02e5cc868188d187ce3092519abdf
+DIST cgicc-3.2.20.tar.gz 2802735 BLAKE2B cdc8520eb9f08c24475037df2e82f61ff31e128869291959b9c6334ae3292450a79bd84e867f5eb5f7672699a4f72e6a5683ee6abdbe0493275b40bf8f300510 SHA512 e57b8f30b26b29008bcf1ffc3b2d272bdbd77848fb02e24912b6182ae90923d5933b9d204c556ac922a389f73ced465065b6e2202fc0c3d008e0e6038e7c8052
diff --git a/dev-libs/cgicc/cgicc-3.2.20.ebuild b/dev-libs/cgicc/cgicc-3.2.20.ebuild
new file mode 100644
index 0000000000..66ab510fa2
--- /dev/null
+++ b/dev-libs/cgicc/cgicc-3.2.20.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A C++ class library for writing CGI applications"
+HOMEPAGE="https://www.gnu.org/software/cgicc/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 doc? ( FDL-1.2 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples static-libs"
+
+RDEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/${PN}-3.2.19-optional-doc.patch" )
+
+# False positive, bug #785328.
+QA_SONAME="usr/lib*/libcgicc.so*"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable examples demos) \
+		$(use_enable doc) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc {contrib,demo}/{*.{cpp,h},*.cgi,README}
+	fi
+}