diff --git a/security/crack/patches/patch-Crack b/security/crack/patches/patch-Crack
new file mode 100644
index 00000000000..884198865bb
--- /dev/null
+++ b/security/crack/patches/patch-Crack
@@ -0,0 +1,52 @@
+--- Crack.orig	Fri Dec 20 18:09:41 1996
++++ Crack	Thu May  4 18:59:18 2000
+@@ -279,23 +279,11 @@
+ # Sanity test bindir - written in gruntscript for clarity.
+ ###
+ 
+-bdname=`scripts/binstamp 2>/dev/null`
+-
+-if [ "x$bdname" = "x" ]
+-then
+-	echo "Crack: error: cannot continue as binstamp returned empty string" 1>&2
+-	exit 0
+-fi
+-
+-echo "Stamp: $bdname"
+-echo ""
+-
+-
+ if [ "x$1" != "x" ]
+ then
+ 	if [ "$1" = "-fmt" ]            # use generic name
+ 	then
+-		bindir=run/bin/$bdname
++		bindir=run/bin
+ 	elif [ -d run/bin/$1 ]          # have been here before
+ 	then
+ 		bindir=run/bin/$1
+@@ -305,20 +293,20 @@
+ 		bindir=run/bin/$1
+ 		shift
+ 	else                            # use generic name
+-		bindir=run/bin/$bdname
++		bindir=run/bin
+ 	fi
+ else                                    # supporting "-makeonly"
+ 	if [ "$makeonlyflag" != "" ]
+ 	then
+-		bindir=run/bin/$bdname
++		bindir=run/bin
+ 
+ 	elif [ "$makedictflag" != "" ]
+ 	then
+-		bindir=run/bin/$bdname
++		bindir=run/bin
+ 
+ 	elif [ "$remoteflag" != "" ]
+ 	then
+-		bindir=run/bin/$bdname
++		bindir=run/bin
+ 	else
+ 		echo $usage 1>&2
+ 		exit 1
diff --git a/security/crack/pkg/PLIST b/security/crack/pkg/PLIST
index 80a59084582..d704d6673e4 100644
--- a/security/crack/pkg/PLIST
+++ b/security/crack/pkg/PLIST
@@ -1,4 +1,6 @@
+@comment $OpenBSD: PLIST,v 1.3 2000/05/05 01:14:54 turan Exp $
 crack/Crack
+crack/Crack.orig
 crack/LICENCE
 crack/Makefile
 crack/Reporter
@@ -107,13 +109,13 @@ crack/extra/b64encode
 crack/extra/brute.c
 crack/manual.html
 crack/manual.txt
-crack/run/bin/openbsd-2-intel_pentium_iii_genuineintel_686-class_512kb_l2_cache_/cracker
-crack/run/bin/openbsd-2-intel_pentium_iii_genuineintel_686-class_512kb_l2_cache_/dawg
-crack/run/bin/openbsd-2-intel_pentium_iii_genuineintel_686-class_512kb_l2_cache_/dictfilt
-crack/run/bin/openbsd-2-intel_pentium_iii_genuineintel_686-class_512kb_l2_cache_/kickdict
-crack/run/bin/openbsd-2-intel_pentium_iii_genuineintel_686-class_512kb_l2_cache_/libc5.a
-crack/run/bin/openbsd-2-intel_pentium_iii_genuineintel_686-class_512kb_l2_cache_/stdlib-cracker
-crack/run/bin/openbsd-2-intel_pentium_iii_genuineintel_686-class_512kb_l2_cache_/xdawg
+crack/run/bin/cracker
+crack/run/bin/dawg
+crack/run/bin/dictfilt
+crack/run/bin/kickdict
+crack/run/bin/libc5.a
+crack/run/bin/stdlib-cracker
+crack/run/bin/xdawg
 crack/run/dict/.dictmade
 crack/run/dict/1.dwg.gz
 crack/run/dict/2.dwg.gz
@@ -238,7 +240,6 @@ crack/src/util/kickdict.c
 @dirrm crack/src
 @dirrm crack/scripts
 @dirrm crack/run/dict
-@dirrm crack/run/bin/openbsd-2-intel_pentium_iii_genuineintel_686-class_512kb_l2_cache_
 @dirrm crack/run/bin
 @dirrm crack/run
 @dirrm crack/extra