diff --git a/devel/flawfinder/Makefile b/devel/flawfinder/Makefile
index 293a600b156..a8c828f0f2e 100644
--- a/devel/flawfinder/Makefile
+++ b/devel/flawfinder/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2003/04/10 04:53:02 jsyn Exp $
+# $OpenBSD: Makefile,v 1.21 2004/02/05 23:29:34 xsa Exp $
 
-COMMENT=		"c/c++ source code auditing tool"
+COMMENT=		"C/C++ source code auditing tool"
 
-DISTNAME=		flawfinder-1.22
-CATEGORIES=    		devel security
+DISTNAME=		flawfinder-1.24
+CATEGORIES=		devel security
 
 HOMEPAGE=		http://www.dwheeler.com/flawfinder/
 
@@ -15,33 +15,23 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		http://www.dwheeler.com/flawfinder/ \
+MASTER_SITES=		${HOMEPAGE} \
 			${MASTER_SITE_PACKETSTORM:=UNIX/security/}
 
-PYTHON_VER=		2.2
-RUN_DEPENDS=		:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
+MODULES=		python
 
 NO_BUILD=		Yes
-
-MAKE_FILE=		makefile
-FAKE_FLAGS=		INSTALL_DIR=${WRKINST}${PREFIX}
-
 NO_REGRESS=		Yes
 
 DOC_DIR=		${PREFIX}/share/doc/flawfinder
-DOC_FILES=		ChangeLog README flawfinder.pdf \
-			flawfinder.ps index.html test.c \
-			announcement
 
-post-patch:
-	perl -pi -e \
-		"s|/usr/bin/env python|${LOCALBASE}/bin/python${PYTHON_VER}|" \
+pre-build:
+	@perl -pi -e \
+		"s|/usr/bin/env python|${LOCALBASE}/bin/python${MODPY_VERSION}|" \
 		${WRKSRC}/flawfinder
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOC_DIR}
-.for i in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/$i ${DOC_DIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/flawfinder.{pdf,ps} ${DOC_DIR}
 
 .include <bsd.port.mk>
diff --git a/devel/flawfinder/distinfo b/devel/flawfinder/distinfo
index 5b2c04e5e6b..f4ef63cac37 100644
--- a/devel/flawfinder/distinfo
+++ b/devel/flawfinder/distinfo
@@ -1,3 +1,3 @@
-MD5 (flawfinder-1.22.tar.gz) = a6746b5e8b443e777ebd223edae33e6d
-RMD160 (flawfinder-1.22.tar.gz) = 3951b84b2c1cbbb99c2b8f1178e6b09dabe58214
-SHA1 (flawfinder-1.22.tar.gz) = 55ef373f05e1c0f759b7e9689bb90218c4aa504c
+MD5 (flawfinder-1.24.tar.gz) = 85a291ae9bf5a6eec823169057f950df
+RMD160 (flawfinder-1.24.tar.gz) = af5a037afeed92ea6ff1ba54711c59aad2dd2c9a
+SHA1 (flawfinder-1.24.tar.gz) = 600e59a113327ad54875ed8a657146613bd59013
diff --git a/devel/flawfinder/patches/patch-setup_py b/devel/flawfinder/patches/patch-setup_py
new file mode 100644
index 00000000000..f458f7086a9
--- /dev/null
+++ b/devel/flawfinder/patches/patch-setup_py
@@ -0,0 +1,11 @@
+$OpenBSD: patch-setup_py,v 1.1 2004/02/05 23:29:34 xsa Exp $
+--- setup.py.orig	2003-10-30 04:12:43.000000000 +0100
++++ setup.py	2004-02-05 12:05:53.000000000 +0100
+@@ -36,6 +36,6 @@ ranking them by likely severity.
+ It is released under the GNU GPL license.""",
+        url = "http://www.dwheeler.com/flawfinder/",
+        scripts = [ 'flawfinder' ],
+-       data_files = [ ('share/man/man1', [ 'flawfinder.1.gz' ]) ],
++       data_files = [ ('man/man1', [ 'flawfinder.1' ]) ],
+        py_modules = [ ],
+       )
diff --git a/devel/flawfinder/pkg/PLIST b/devel/flawfinder/pkg/PLIST
index 0df5a94e833..c62f03eaaf1 100644
--- a/devel/flawfinder/pkg/PLIST
+++ b/devel/flawfinder/pkg/PLIST
@@ -1,11 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.4 2001/11/18 19:55:31 jsyn Exp $
+@comment $OpenBSD: PLIST,v 1.5 2004/02/05 23:29:35 xsa Exp $
 bin/flawfinder
 man/man1/flawfinder.1
-share/doc/flawfinder/ChangeLog
-share/doc/flawfinder/README
-share/doc/flawfinder/announcement
 share/doc/flawfinder/flawfinder.pdf
 share/doc/flawfinder/flawfinder.ps
-share/doc/flawfinder/index.html
-share/doc/flawfinder/test.c
 @dirrm share/doc/flawfinder