diff --git a/security/pam-mysql/Makefile b/security/pam-mysql/Makefile
index 70d44db6acd7..b8082a2b05f7 100644
--- a/security/pam-mysql/Makefile
+++ b/security/pam-mysql/Makefile
@@ -1,39 +1,44 @@
 # Created by: Anders Nordby <anders@fix.no>
 
 PORTNAME=	pam_mysql
-PORTVERSION=	0.7.r1
-PORTREVISION=	6
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.8.2
 CATEGORIES=	security databases
-MASTER_SITES=	SF/pam-mysql/pam-mysql/0.7RC1
-DISTNAME=	${PORTNAME}-0.7RC1${DISTVERSIONSUFFIX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Pam module for authenticating with MySQL
+MAINTAINER=	jsm@FreeBSD.org
+COMMENT=	PAM module for authenticating with MySQL
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		compiler:c11 libtool:keepla mysql
+USES=		autoreconf compiler:c11 libtool:keepla mysql pkgconfig
+
+USE_GITHUB=	yes
+GH_ACCOUNT=     NigelCunningham
+GH_PROJECT=	pam-MySQL
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} \
-		--with-pam-mods-dir=${PREFIX}/lib \
-		--with-pam=/usr
 
+CONFIGURE_ARGS=	--with-pam=/usr/lib --with-pam-mods-dir=${LOCALBASE}/lib
 SUB_FILES=	pkg-message
 
 PORTDOCS=	*
 PLIST_FILES=	lib/pam_mysql.so lib/pam_mysql.la
 
-OPTIONS_DEFINE= DOCS SSL
-SSL_DESC=	Build with OpenSSL support (non-crypt()ish MD5 hash)
-SSL_CONFIGURE_WITH= openssl
+OPTIONS_DEFINE=	DOCS SSL
+OPTIONS_DEFAULT=	DOCS SSL
+
+SSL_DESC=       Build with OpenSSL support (non-crypt()ish MD5 and SHA1 hash)
+SSL_CONFIGURE_ENV= openssl_CFLAGS="${OPENSSLINC}" \
+	           openssl_LIBS="${OPENSSLLIB}"
+SSL_CONFIGURE_WITH=openssl
+SSL_USES=	ssl
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pam_mysql.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/NEWS \
 		${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/pam-mysql/distinfo b/security/pam-mysql/distinfo
index 9f722f9bc0a5..b4b3a6080332 100644
--- a/security/pam-mysql/distinfo
+++ b/security/pam-mysql/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pam_mysql-0.7RC1.tar.gz) = cb3cf89b9b51cb196ee8d731f85acbab72b4878a3a7c4183c5534161d4385ce7
-SIZE (pam_mysql-0.7RC1.tar.gz) = 335240
+TIMESTAMP = 1622744756
+SHA256 (NigelCunningham-pam-MySQL-v0.8.2_GH0.tar.gz) = 012529868418bcb23b22d466ca7e526a6a08f42736cd67d41118151e285c777b
+SIZE (NigelCunningham-pam-MySQL-v0.8.2_GH0.tar.gz) = 55023
diff --git a/security/pam-mysql/files/patch-acinclude.m4 b/security/pam-mysql/files/patch-acinclude.m4
deleted file mode 100644
index b506fcb9a7bb..000000000000
--- a/security/pam-mysql/files/patch-acinclude.m4
+++ /dev/null
@@ -1,10 +0,0 @@
---- acinclude.m4.orig	2006-01-09 10:35:59 UTC
-+++ acinclude.m4
-@@ -445,6 +445,7 @@ md5_calc(0, 0, 0);
-     AC_MSG_RESULT([no])
- 
-     AC_CHECK_HEADERS([md5.h])
-+    AC_CHECK_LIB([md],[MD5Data])
-     AC_CHECK_FUNCS([MD5Data])
-   ])
- ])
diff --git a/security/pam-mysql/files/pkg-message.in b/security/pam-mysql/files/pkg-message.in
index c908f2d7c8b5..345ede86f1a9 100644
--- a/security/pam-mysql/files/pkg-message.in
+++ b/security/pam-mysql/files/pkg-message.in
@@ -1,15 +1,7 @@
 [
 { type: install
   message: <<EOM
 Read files in %%DOCSDIR%% for info on how to set up.
-
-The PAM subsystem only looks for modules in /usr/lib: to use any pam module
-from the ports, either specify the full pathname in your pam.d config file
-(eg: %%PREFIX%%/lib/pam_mysql.so instead of pam_mysql.so) or copy/symlink
-%%PREFIX%%/lib/pam_mysql.so to /usr/lib/pam_mysql.so to be able to use it.
-
-Example:
-ln -sf %%PREFIX%%/lib/pam_mysql.so /usr/lib/pam_mysql.so
 EOM
 }
 ]
diff --git a/security/pam-mysql/pkg-descr b/security/pam-mysql/pkg-descr
index 0317415bb7fb..07c048c920c0 100644
--- a/security/pam-mysql/pkg-descr
+++ b/security/pam-mysql/pkg-descr
@@ -1,3 +1,3 @@
 This is a PAM module for authenticating with MySQL.
 
-WWW: http://pam-mysql.sourceforge.net/
+WWW: https://github.com/NigelCunningham/pam-MySQL