diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 64df2b9bd9ff..8b9b1180976e 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	opensc
-PORTVERSION=	0.19.0
-PORTREVISION=	1
+DISTVERSION=	0.20.0-rc3
 CATEGORIES=	security devel
-MASTER_SITES=	https://github.com/OpenSC/OpenSC/releases/download/${PORTVERSION}/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Libraries and utilities to access smart cards
@@ -26,6 +24,11 @@ CTAPI_DESC=	Use CT-API backend
 SM_DESC=	Enable secure messaging support
 NOTIFY_DESC=	Enable notification support
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	OpenSC
+GH_PROJECT=	${GH_ACCOUNT}
+GH_TAGNAME=	${GH_PROJECT}-${DISTVERSION}
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
diff --git a/security/opensc/distinfo b/security/opensc/distinfo
index 4c28c6e4a67b..3527464d0e8e 100644
--- a/security/opensc/distinfo
+++ b/security/opensc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538984930
-SHA256 (opensc-0.19.0.tar.gz) = 2c5a0e4df9027635290b9c0f3addbbf0d651db5ddb0ab789cb0e978f02fd5826
-SIZE (opensc-0.19.0.tar.gz) = 2080320
+TIMESTAMP = 1571913284
+SHA256 (OpenSC-OpenSC-0.20.0-rc3-OpenSC-0.20.0-rc3_GH0.tar.gz) = 7fa011486e0b0cba5a32fb69ab25018c6904ac727d6b25b685518758a0c3a196
+SIZE (OpenSC-OpenSC-0.20.0-rc3-OpenSC-0.20.0-rc3_GH0.tar.gz) = 1647932
diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist
index 5add7f6c2e8c..684c37f1fb01 100644
--- a/security/opensc/pkg-plist
+++ b/security/opensc/pkg-plist
@@ -4,6 +4,7 @@ bin/dnie-tool
 bin/egk-tool
 bin/eidenv
 bin/gids-tool
+bin/goid-tool
 bin/iasecc-tool
 bin/netkey-tool
 bin/npa-tool
@@ -13,6 +14,7 @@ bin/opensc-explorer
 bin/opensc-notify
 bin/opensc-tool
 bin/piv-tool
+bin/pkcs11-register
 bin/pkcs11-tool
 bin/pkcs15-crypt
 bin/pkcs15-init
@@ -41,6 +43,7 @@ etc/bash_completion.d/pkcs15-tool
 etc/bash_completion.d/sc-hsm-tool
 etc/bash_completion.d/westcos-tool
 @sample etc/opensc.conf.sample
+etc/xdg/autostart/pkcs11-register.desktop
 lib/libopensc.a
 lib/libopensc.so
 lib/libopensc.so.6
@@ -83,6 +86,7 @@ share/applications/org.opensc.notify.desktop
 %%DATADIR%%/pkcs15.profile
 %%DATADIR%%/rutoken.profile
 %%DATADIR%%/rutoken_ecp.profile
+%%DATADIR%%/rutoken_lite.profile
 %%DATADIR%%/sc-hsm.profile
 %%DATADIR%%/setcos.profile
 %%DATADIR%%/starcos.profile