diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index dd36fa74e370..6c4ebf2dff34 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -1,55 +1,52 @@
 # Created by: Yoichi NAKAYAMA <yoichi@FreeBSD.org>
 
 PORTNAME=	bbdb
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2
-PORTREVISION=	5
+DISTVERSION=	3.2.2a
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	emacs@FreeBSD.org
 COMMENT=	Big Brother Database
 
 LICENSE=	GPLv3+
 
-.if ${FLAVOR:U} == devel_full || ${FLAVOR:U} == devel_nox
-BROKEN=		Error occurred processing bbdb.el: Wrong type argument ((stringp nil))
-.endif
-
 BUILD_DEPENDS=	texi2dvi:print/texinfo
 
 USES=		autoreconf emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacsmirror
-USE_TEX=	latex:build
+GH_TAGNAME=	a50c89a
 
 BBDB_LISPDIR=	${EMACS_SITE_LISPDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
 # Do not install the info file.  Upstream has yet to add any real content to it.
 #INFO=		bbdb
 PORTDOCS=	bbdb.pdf
 NO_ARCH=	yes
 PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
 
 OPTIONS_DEFINE=	DOCS
+DOCS_USE=	TEX=latex:build
+DOCS_CONFIGURE_ENABLE=	docs
 
 # See http://lists.nongnu.org/archive/html/bbdb-user/2018-11/msg00003.html
 .if ${FLAVOR:U} != devel_full && ${FLAVOR:U} != devel_nox
 post-configure:
 	${REINPLACE_CMD} -e '/[[:blank:]]*--eval '\''(setq byte-compile-dest-file-function (lambda (_) "$$@"))'\'' \\/d' \
 		${WRKSRC}/lisp/Makefile
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${WRKSRC}/lisp/*.elc \
 		${STAGEDIR}${PREFIX}/${BBDB_LISPDIR}
 # Do not install the info file.  Upstream has yet to add any real content to it.
 #	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.info \
 #		${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/bbdb.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/bbdb/distinfo b/databases/bbdb/distinfo
index 2f18b76c1ced..77eec132116c 100644
--- a/databases/bbdb/distinfo
+++ b/databases/bbdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542049821
-SHA256 (emacsmirror-bbdb-v3.2_GH0.tar.gz) = 36482abe5e9c11b9262334ae741b8828b9e76e708e54900559a70974f9f0b5df
-SIZE (emacsmirror-bbdb-v3.2_GH0.tar.gz) = 189456
+TIMESTAMP = 1649185489
+SHA256 (emacsmirror-bbdb-v3.2.2a-a50c89a_GH0.tar.gz) = 07bacd44de94722bdca41e4145680bd6c008105d8c809bba99db61177ea11d50
+SIZE (emacsmirror-bbdb-v3.2.2a-a50c89a_GH0.tar.gz) = 198766