diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 3da1f8d445f1..e50d3e787889 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -1,60 +1,66 @@
 PORTNAME=	mdbtools
 DISTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Utilities and libraries to export data from MS Access databases (.mdb)
 WWW=		https://github.com/mdbtools/mdbtools/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash-completion>=0:shells/bash-completion \
 		flex:textproc/flex \
 		gawk:lang/gawk
 LIB_DEPENDS=	libodbcinst.so:databases/unixODBC
 RUN_DEPENDS=	bash-completion>=0:shells/bash-completion
 
 USES=		bison cpe gnome iconv:wchar_t libtool pathfix \
 		pkgconfig readline
 CPE_VENDOR=	mdbtools_project
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-unixodbc=${LOCALBASE}
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DOCS MANPAGES LIBMSWSTR NLS
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 LIBMSWSTR_DESC=	Read and parse JET 4 mdb file indices
 
 LIBMSWSTR_LIB_DEPENDS=		libmswstr.so:databases/libmswstr
 LIBMSWSTR_CONFIGURE_ENV_OFF=	ac_cv_lib_mswstr_DBLCMapStringW=no
 MANPAGES_CONFIGURE_OFF=		--disable-man
 NLS_USES=			gettext
 
 DOCS=		AUTHORS HACKING.md NEWS README.md
 
 .include <bsd.port.pre.mk>
 
 .if ${LLVM_DEFAULT} >= 15
 # With LLVM15:  parser.c:1053:9: error:
 # variable 'yynerrs' set but not used [-Werror,-Wunused-but-set-variable]
 BUILD_DEPENDS+=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
 LLVM_VER=	14
 #CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm
 CC=		clang${LLVM_VER}
 CPP=		clang-cpp${LLVM_VER}
 CXX=		clang++${LLVM_VER}
 .endif
 
+post-configure:
+	@${REINPLACE_CMD} -e \
+		's|libdir = $${exec_prefix}/lib/odbc|libdir = $${exec_prefix}/lib|' \
+		${WRKSRC}/src/odbc/Makefile
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,}  ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/databases/mdbtools/pkg-plist b/databases/mdbtools/pkg-plist
index 6ba6d75d506d..2bcf1a1f1be1 100644
--- a/databases/mdbtools/pkg-plist
+++ b/databases/mdbtools/pkg-plist
@@ -1,59 +1,59 @@
 bin/mdb-array
 bin/mdb-count
 bin/mdb-export
 bin/mdb-header
 bin/mdb-hexdump
 bin/mdb-json
 bin/mdb-parsecsv
 bin/mdb-prop
 bin/mdb-queries
 bin/mdb-schema
 bin/mdb-sql
 bin/mdb-tables
 bin/mdb-ver
 include/mdbsql.h
 include/mdbtools.h
 lib/libmdb.a
 lib/libmdb.so
 lib/libmdb.so.3
 lib/libmdb.so.3.1.0
+lib/libmdbodbc.a
+lib/libmdbodbc.so
+lib/libmdbodbcW.a
+lib/libmdbodbcW.so
 lib/libmdbsql.a
 lib/libmdbsql.so
 lib/libmdbsql.so.3
 lib/libmdbsql.so.3.1.0
-lib/odbc/libmdbodbc.a
-lib/odbc/libmdbodbc.so
-lib/odbc/libmdbodbcW.a
-lib/odbc/libmdbodbcW.so
 libdata/pkgconfig/libmdb.pc
 libdata/pkgconfig/libmdbsql.pc
-%%MANPAGES%%man/man1/mdb-array.1.gz
-%%MANPAGES%%man/man1/mdb-count.1.gz
-%%MANPAGES%%man/man1/mdb-export.1.gz
-%%MANPAGES%%man/man1/mdb-header.1.gz
-%%MANPAGES%%man/man1/mdb-hexdump.1.gz
-%%MANPAGES%%man/man1/mdb-import.1.gz
-%%MANPAGES%%man/man1/mdb-json.1.gz
-%%MANPAGES%%man/man1/mdb-parsecsv.1.gz
-%%MANPAGES%%man/man1/mdb-prop.1.gz
-%%MANPAGES%%man/man1/mdb-queries.1.gz
-%%MANPAGES%%man/man1/mdb-schema.1.gz
-%%MANPAGES%%man/man1/mdb-sql.1.gz
-%%MANPAGES%%man/man1/mdb-tables.1.gz
-%%MANPAGES%%man/man1/mdb-ver.1.gz
 share/bash-completion/completions/mdb-count
 share/bash-completion/completions/mdb-export
 share/bash-completion/completions/mdb-hexdump
 share/bash-completion/completions/mdb-import
 share/bash-completion/completions/mdb-json
 share/bash-completion/completions/mdb-parsecsv
 share/bash-completion/completions/mdb-prop
 share/bash-completion/completions/mdb-queries
 share/bash-completion/completions/mdb-schema
 share/bash-completion/completions/mdb-sql
 share/bash-completion/completions/mdb-tables
 share/bash-completion/completions/mdb-ver
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/HACKING.md
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.md
+%%MANPAGES%%share/man/man1/mdb-array.1.gz
+%%MANPAGES%%share/man/man1/mdb-count.1.gz
+%%MANPAGES%%share/man/man1/mdb-export.1.gz
+%%MANPAGES%%share/man/man1/mdb-header.1.gz
+%%MANPAGES%%share/man/man1/mdb-hexdump.1.gz
+%%MANPAGES%%share/man/man1/mdb-import.1.gz
+%%MANPAGES%%share/man/man1/mdb-json.1.gz
+%%MANPAGES%%share/man/man1/mdb-parsecsv.1.gz
+%%MANPAGES%%share/man/man1/mdb-prop.1.gz
+%%MANPAGES%%share/man/man1/mdb-queries.1.gz
+%%MANPAGES%%share/man/man1/mdb-schema.1.gz
+%%MANPAGES%%share/man/man1/mdb-sql.1.gz
+%%MANPAGES%%share/man/man1/mdb-tables.1.gz
+%%MANPAGES%%share/man/man1/mdb-ver.1.gz