diff --git a/security/crank/Makefile b/security/crank/Makefile
index 0f9a526366e..a7b2a3d4dfa 100644
--- a/security/crank/Makefile
+++ b/security/crank/Makefile
@@ -1,39 +1,28 @@
-# $OpenBSD: Makefile,v 1.12 2004/12/27 13:28:33 alek Exp $
+# $OpenBSD: Makefile,v 1.13 2005/07/18 17:02:48 aanriot Exp $
 
-COMMENT=	"classical (pen-and-paper) cipher cryptanalysis toolkit"
+COMMENT=	"classical cipher cryptanalysis toolkit"
 
-DISTNAME=		crank-0.1.4
+DISTNAME=		crank-0.2.1
 CATEGORIES=		security
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=crank/}
-
 HOMEPAGE=		http://crank.sourceforge.net/
 
-LIB_DEPENDS=		gtk.1.2,gdk.1.2::x11/gtk+
-
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xi c glib gmodule iconv intl m
+
+WANTLIB=	c iconv intl glib gmodule m X11 Xext Xi
+NO_REGRESS=	Yes
+
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=crank/}
+
+LIB_DEPENDS=		gtk.1.2,gdk.1.2::x11/gtk+ \
+			guile.9::lang/guile
 
 CONFIGURE_STYLE=	gnu
-USE_GMAKE=		Yes
-NO_REGRESS=		Yes
-
-DOC=	BUGS HISTORY LICENSE README ciphertext.txt ciphertext2.txt
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/crank ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/crank
-	${INSTALL_DATA_DIR} ${PREFIX}/share/crank/data
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/crank
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/crank/plugins
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/crank
-	${INSTALL_DATA} ${WRKSRC}/data/*.dat ${PREFIX}/share/crank/data
-	${INSTALL_DATA} ${WRKSRC}/plugin-src/*.so ${PREFIX}/lib/crank/plugins
-.for file in ${DOC}
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/crank
-.endfor
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/security/crank/distinfo b/security/crank/distinfo
index f24c330382e..c8a00215b15 100644
--- a/security/crank/distinfo
+++ b/security/crank/distinfo
@@ -1,4 +1,4 @@
-MD5 (crank-0.1.4.tar.gz) = 5fb4464f22a2efcedbd336ee6ab3fbce
-RMD160 (crank-0.1.4.tar.gz) = b94d8433948636a3efd37a9dee4b1d1c1f0278df
-SHA1 (crank-0.1.4.tar.gz) = 67efa5d66c7dff951f016138ee2a9ae37116227e
-SIZE (crank-0.1.4.tar.gz) = 180587
+MD5 (crank-0.2.1.tar.gz) = 6998a5deea4d6dba358dfd66f8df3bce
+RMD160 (crank-0.2.1.tar.gz) = 410d9d716eb4db3ff7cf78e9529ebea7f9660803
+SHA1 (crank-0.2.1.tar.gz) = d225e56b2f2ef22dc56532aad0e36ca0ef71016a
+SIZE (crank-0.2.1.tar.gz) = 271933
diff --git a/security/crank/patches/patch-Makefile_in b/security/crank/patches/patch-Makefile_in
deleted file mode 100644
index db9bfb689a2..00000000000
--- a/security/crank/patches/patch-Makefile_in
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.in~	Mon Oct 28 14:22:51 2002
-+++ Makefile.in	Mon Oct 28 14:23:10 2002
-@@ -7,9 +7,9 @@
- prefix=@prefix@
- exec_prefix = @exec_prefix@
- VERSION = $(shell cat VERSION)
--CC = gcc
-+CC = @CC@
- PLUGIN-INSTALL = @libdir@/crank/plugins
--CFLAGS = -O2 -Wall @GTK_CFLAGS@ -DPLUGIN_DIR=\"$(PLUGIN-INSTALL)\"
-+CFLAGS += -Wall @GTK_CFLAGS@ -DPLUGIN_DIR=\"$(PLUGIN-INSTALL)\"
- LIBS  = @GTK_LIBS@
- OBJFILES = $(patsubst %.c,%.o,$(wildcard *.c))
- PLUGIN-INSTALL = @libdir@/crank/plugins
diff --git a/security/crank/patches/patch-configure b/security/crank/patches/patch-configure
deleted file mode 100644
index f745a3a79a3..00000000000
--- a/security/crank/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Aug  9 11:27:48 2001
-+++ configure	Thu Aug  9 11:28:00 2001
-@@ -9,7 +9,7 @@
- 
- # Defaults:
- ac_help=
--ac_default_prefix=/usr/local
-+ac_default_prefix=${LOCALBASE}
- # Any additions from configure.in:
- ac_help="$ac_help
-   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
diff --git a/security/crank/patches/patch-plugin_src_Makefile_in b/security/crank/patches/patch-plugin_src_Makefile_in
deleted file mode 100644
index 2161d3c6c61..00000000000
--- a/security/crank/patches/patch-plugin_src_Makefile_in
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-plugin_src_Makefile_in,v 1.1 2002/10/28 22:34:35 mark Exp $
---- plugin-src/Makefile.in~	Mon Oct 28 14:28:44 2002
-+++ plugin-src/Makefile.in	Mon Oct 28 14:28:57 2002
-@@ -8,8 +8,8 @@ prefix=@prefix@
- CRANK_DIR = ..
- INSTALL_DIR = ..
- DATA_DIR = @datadir@/crank
--CC = gcc
--CFLAGS = -O2 -Wall -fPIC @GTK_CFLAGS@ -I$(CRANK_DIR) -DDATA_DIR=\"$(DATA_DIR)\"
-+CC = @CC@
-+CFLAGS += -Wall -fPIC @GTK_CFLAGS@ -I$(CRANK_DIR) -DDATA_DIR=\"$(DATA_DIR)\"
- 
- all: monoalphabetic.key-controls.so \
-      statistics.n-grams.so \
diff --git a/security/crank/patches/patch-src_Makefile_in b/security/crank/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..69e622128da
--- /dev/null
+++ b/security/crank/patches/patch-src_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2005/07/18 17:02:48 aanriot Exp $
+--- src/Makefile.in.orig	Sun Jul 17 22:37:10 2005
++++ src/Makefile.in	Sun Jul 17 22:38:32 2005
+@@ -102,7 +102,7 @@ guile_only_sources = crank_wrap.c scheme
+ 
+ plugindir = $(pkglibdir)/plugins
+ INCLUDES = -DPLUGINDIR=\""$(plugindir)"\" -DDATADIR=\""$(pkgdatadir)"\"
+-CFLAGS = @CFLAGS@ @GTK_CFLAGS@ -Wall
++CFLAGS = @CPPFLAGS@ @CFLAGS@ @GTK_CFLAGS@ -Wno-endif-labels
+ LIBS = @LIBS@ @GTK_LIBS@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff --git a/security/crank/pkg/PLIST b/security/crank/pkg/PLIST
index 485c67e3b37..23257514fd2 100644
--- a/security/crank/pkg/PLIST
+++ b/security/crank/pkg/PLIST
@@ -1,26 +1,23 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/15 18:35:59 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2005/07/18 17:02:49 aanriot Exp $
 bin/crank
+@info info/crank.info
 lib/crank/
 lib/crank/plugins/
-lib/crank/plugins/fitness.word-count.so
-lib/crank/plugins/monoalphabetic.hillclimb-cracker.so
-lib/crank/plugins/monoalphabetic.key-controls.so
-lib/crank/plugins/statistics.n-grams.so
-lib/crank/plugins/steganalysis.word-gaps.so
-lib/crank/plugins/text.simple-filters.so
-lib/crank/plugins/transpositions.grid-brute-force.so
-lib/crank/plugins/transpositions.grid-controls.so
-lib/crank/plugins/utilities.notepad.so
 share/crank/
-share/crank/data/
-share/crank/data/bift.dat
-share/crank/data/slft.dat
-share/crank/data/trift.dat
-share/crank/data/word-list.dat
+share/crank/24_sort_ascending.xpm
+share/crank/arrows_ver.xpm
+share/crank/bift.dat
+share/crank/function_selector.xpm
+share/crank/gear_small.xpm
+share/crank/gnome-db-browser.xpm
+share/crank/open.xpm
+share/crank/patch/
+share/crank/patch/std_monoalphabetic.scm
+share/crank/save.xpm
+share/crank/scheme/
+share/crank/scheme/crank.scm
+share/crank/slft.dat
+share/crank/source.xpm
+share/crank/stop.xpm
+share/crank/trift.dat
 share/doc/crank/
-share/doc/crank/BUGS
-share/doc/crank/HISTORY
-share/doc/crank/LICENSE
-share/doc/crank/README
-share/doc/crank/ciphertext.txt
-share/doc/crank/ciphertext2.txt