diff --git a/security/Makefile b/security/Makefile
index 9ea104747b40..2f0c1d1e6e2c 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2003/08/19 15:48:17 agc Exp $
+# $NetBSD: Makefile,v 1.140 2003/08/29 00:25:34 dan Exp $
 #
 
 COMMENT=	Security tools
@@ -15,6 +15,7 @@ SUBDIR+=	arirang
 SUBDIR+=	audit-packages
 SUBDIR+=	avcheck
 SUBDIR+=	beecrypt
+SUBDIR+=	bitstir
 SUBDIR+=	cfs
 SUBDIR+=	crack
 SUBDIR+=	cy-login
diff --git a/security/bitstir/DESCR b/security/bitstir/DESCR
new file mode 100644
index 000000000000..26b801f31b93
--- /dev/null
+++ b/security/bitstir/DESCR
@@ -0,0 +1,7 @@
+Bitstir monitors the level of entropy available from /dev/random and
+generates disk activity to automatically restore this level when it
+gets low.  Programs which block when entropy runs out are delayed only
+momentarily if at all.
+
+Bitstir was written by Peter Hendrickson <pdh@wiredyne.com>.  There
+is a page at http://www.wiredyne.com/software/bitstir.html.
diff --git a/security/bitstir/Makefile b/security/bitstir/Makefile
new file mode 100644
index 000000000000..48e56d804fcc
--- /dev/null
+++ b/security/bitstir/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2003/08/29 00:25:35 dan Exp $
+#
+
+DISTNAME=		bitstir-0.2
+CATEGORIES=		security
+MASTER_SITES=		http://www.wiredyne.com/software/downloads/
+
+MAINTAINER=		pdh@wiredyne.com
+HOMEPAGE=		http://www.wiredyne.com/software/downloads/
+COMMENT=		Entropy restoration daemon
+
+USE_BUILDLINK2=		yes
+
+ONLY_FOR_PLATFORM=	NetBSD-*-*
+ 
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/bitstir/Makefile~ b/security/bitstir/Makefile~
new file mode 100644
index 000000000000..12d593b1d011
--- /dev/null
+++ b/security/bitstir/Makefile~
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile~,v 1.1 2003/08/29 00:25:36 dan Exp $
+#
+
+DISTNAME=		bitstir-0.2
+CATEGORIES=		security
+MASTER_SITES=		http://www.wiredyne.com/software/downloads/
+
+MAINTAINER=		pdh@wiredyne.com
+HOMEPAGE=		http://www.wiredyne.com/software/downloads/
+COMMENT=		Entropy restoration daemon
+
+USE_BUILDLINK2=		yes
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/bitstir/PLIST b/security/bitstir/PLIST
new file mode 100644
index 000000000000..72202e6d672b
--- /dev/null
+++ b/security/bitstir/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2003/08/29 00:25:36 dan Exp $
+bin/bits-avail
+bin/bitstir
+man/man8/bitstir.8
diff --git a/security/bitstir/distinfo b/security/bitstir/distinfo
new file mode 100644
index 000000000000..cc90439a1fca
--- /dev/null
+++ b/security/bitstir/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2003/08/29 00:25:36 dan Exp $
+
+SHA1 (bitstir-0.2.tar.gz) = 867fc2b28805a71ca2f1e3e3337b3c906951e121
+Size (bitstir-0.2.tar.gz) = 6423 bytes
+SHA1 (patch-aa) = 564b3895b84f07dc05553b3289165e1a2abbe747
diff --git a/security/bitstir/patches/patch-aa b/security/bitstir/patches/patch-aa
new file mode 100644
index 000000000000..caf95edc71f1
--- /dev/null
+++ b/security/bitstir/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2003/08/29 00:25:37 dan Exp $
+
+--- Makefile.orig	Wed Aug 27 12:58:29 2003
++++ Makefile
+@@ -2,8 +2,8 @@
+ 
+ # Makefile for bitstir.
+ 
+-INSTALLDIR=	/usr/local/bin
+-MANDIR=		/usr/local/man
++INSTALLDIR=	${PREFIX}/bin
++MANDIR=		${PREFIX}/man
+ FIND?=		/usr/bin/find
+ 
+ CC?=		cc