diff --git a/security/flawfinder/Makefile b/security/flawfinder/Makefile
index a6895aa9e0d4..919d26c6677d 100644
--- a/security/flawfinder/Makefile
+++ b/security/flawfinder/Makefile
@@ -1,39 +1,49 @@
 # Created by: ijliao
 
 PORTNAME=	flawfinder
-PORTVERSION=	1.31
-PORTREVISION=	1
+PORTVERSION=	2.0.19
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.dwheeler.com/flawfinder/ \
 		PACKETSTORM/UNIX/security
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	se@FreeBSD.org
 COMMENT=	Examines source code looking for security weaknesses
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		python shebangfix
-SHEBANG_FILES=	flawfinder
-NO_BUILD=	yes
+SHEBANG_FILES=	flawfinder.py
 NO_ARCH=	yes
+NO_BUILD=	yes
 
 PLIST_FILES=	bin/flawfinder man/man1/flawfinder.1.gz
-PORTDOCS=	ChangeLog README flawfinder.pdf flawfinder.ps
-PORTEXAMPLES=	test.c correct-results.html correct-results.txt
+PORTDOCS=	ChangeLog README.md flawfinder.pdf flawfinder.ps
+PORTEXAMPLES=	correct-results-004.txt correct-results-005.txt \
+		correct-results-006.txt correct-results-008.txt \
+		correct-results.csv correct-results.html correct-results.txt \
+		makefile no-ending-newline.c test-boost-system.hpp \
+		test-cpp-digit-separator.c test-cpp-digit-separator.cpp \
+		test-diff-005.patch test-junk-006.txt test-junk-008.txt \
+		test-patched.c test-results-004.txt test-results-005.txt \
+		test-results-006.txt test-results-008.txt test-results.csv \
+		test-results.html test-results.txt test-saved-hitlist-006.txt \
+		test-saved-hitlist-008.txt test.c test2.c
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/flawfinder ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/flawfinder.py ${STAGEDIR}${PREFIX}/bin/flawfinder
 	${INSTALL_MAN} ${WRKSRC}/flawfinder.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
-do-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	for f in ${PORTEXAMPLES}; do \
+		${INSTALL_DATA} ${WRKSRC}/test/$$f ${STAGEDIR}${EXAMPLESDIR}; \
+	done
+
 .include <bsd.port.mk>
diff --git a/security/flawfinder/distinfo b/security/flawfinder/distinfo
index 760c40b53774..fa71476ba6f4 100644
--- a/security/flawfinder/distinfo
+++ b/security/flawfinder/distinfo
@@ -1,2 +1,3 @@
-SHA256 (flawfinder-1.31.tar.gz) = bca7256fdf71d778eb59c9d61fc22b95792b997cc632b222baf79cfc04887c30
-SIZE (flawfinder-1.31.tar.gz) = 174148
+TIMESTAMP = 1637065271
+SHA256 (flawfinder-2.0.19.tar.gz) = fe550981d370abfa0a29671346cc0b038229a9bd90b239eab0f01f12212df618
+SIZE (flawfinder-2.0.19.tar.gz) = 260817
diff --git a/security/flawfinder/pkg-descr b/security/flawfinder/pkg-descr
index db74b592cd5b..09739ff9584c 100644
--- a/security/flawfinder/pkg-descr
+++ b/security/flawfinder/pkg-descr
@@ -1,8 +1,8 @@
 Flawfinder searches through source code looking for potential security
 flaws. Flawfinder uses an internal database called the ``ruleset''; the
 ruleset identifies functions that are common causes of security flaws.
 Every potential security flaw found in a given source code file (matching
 an entry in the ruleset) is called a ``hit,'' and the set of hits found
 during any particular run is called the ``hitlist.''
 
-WWW: https://www.dwheeler.com/flawfinder/
+WWW: https://dwheeler.com/flawfinder/