diff --git a/net/sngrep/Makefile b/net/sngrep/Makefile
index f28434c84da5..c608247ccddb 100644
--- a/net/sngrep/Makefile
+++ b/net/sngrep/Makefile
@@ -2,9 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	sngrep
-PORTVERSION=	1.4.7
-DISTVERSIONPREFIX=	v
+DISTVERSION=	1.4.7
+PORTREVISION=	1
 CATEGORIES=	net
+MASTER_SITES=	https://github.com/irontec/sngrep/releases/download/v${DISTVERSION}/
+
+# Fix LDFLAGS
+# Ref: https://github.com/irontec/sngrep/commit/1789d262c0ee90b1057181dc2abef681ba2233a6
+PATCH_SITES=	https://github.com/irontec/sngrep/commit/
+PATCHFILES=	1789d262c0ee90b1057181dc2abef681ba2233a6.patch:-p1
 
 MAINTAINER=	tad@vif.com
 COMMENT=	SIP Packet display and capture
@@ -14,17 +20,16 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		autoreconf localbase ncurses
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	irontec
-
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	OPENSSL PCRE UNICODE IPV6 EEP
 OPTIONS_DEFAULT=	IPV6 EEP UNICODE OPENSSL
 
 OPENSSL_DESC=	Adds OpenSSL support to parse TLS captured messages
+OPENSSL_USES=	ssl
+OPENSSL_CONFIGURE_ENV+=	SSL_CFLAGS="-I${OPENSSLINC}" \
+			SSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 OPENSSL_CONFIGURE_ON=	--with-openssl
-OPENSSL_USES=		ssl
 
 PCRE_DESC=	Adds Perl Compatible regex support
 PCRE_CONFIGURE_ON=	--with-pcre
diff --git a/net/sngrep/distinfo b/net/sngrep/distinfo
index 2cbdc53b118f..b99cdc9f6886 100644
--- a/net/sngrep/distinfo
+++ b/net/sngrep/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1590246641
-SHA256 (irontec-sngrep-v1.4.7_GH0.tar.gz) = 3c96aadd8b8c6b7adb5552d6fb4234f2000f15109b0f6c5feb632c81306cc49b
-SIZE (irontec-sngrep-v1.4.7_GH0.tar.gz) = 237978
+TIMESTAMP = 1598791747
+SHA256 (sngrep-1.4.7.tar.gz) = 3c96aadd8b8c6b7adb5552d6fb4234f2000f15109b0f6c5feb632c81306cc49b
+SIZE (sngrep-1.4.7.tar.gz) = 237978
+SHA256 (1789d262c0ee90b1057181dc2abef681ba2233a6.patch) = b9bf35e68d09e916a229178e36a10cd0e7033d40365f3153355a11fe427f8dc4
+SIZE (1789d262c0ee90b1057181dc2abef681ba2233a6.patch) = 942