diff --git a/security/py-cryptkit/Makefile b/security/py-cryptkit/Makefile
index f0197d65cf3..dd87f8515df 100644
--- a/security/py-cryptkit/Makefile
+++ b/security/py-cryptkit/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2007/10/08 08:22:42 steven Exp $
+# $OpenBSD: Makefile,v 1.13 2009/03/25 20:14:23 jasper Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	Python Cryptographic Toolkit
 
 DISTNAME=	cryptkit-0.9
-PKGNAME=	py-${DISTNAME}p1
+PKGNAME=	py-${DISTNAME}p3
 CATEGORIES=    	security devel
 
 HOMEPAGE=	http://eevolved.com/cryptkit/
diff --git a/security/py-cryptkit/patches/patch-ecc_src_onb_integer_c b/security/py-cryptkit/patches/patch-ecc_src_onb_integer_c
new file mode 100644
index 00000000000..848bb5e97db
--- /dev/null
+++ b/security/py-cryptkit/patches/patch-ecc_src_onb_integer_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-ecc_src_onb_integer_c,v 1.1 2009/03/25 20:14:23 jasper Exp $
+
+Fix potential 64-bit issue due to missing header.
+
+--- ecc/src/onb_integer.c.orig	Wed Mar 25 21:11:34 2009
++++ ecc/src/onb_integer.c	Wed Mar 25 21:11:57 2009
+@@ -21,6 +21,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include "bigint.h"
+ #include "eliptic.h"
diff --git a/security/py-cryptkit/patches/patch-sha256_src_sha2_c b/security/py-cryptkit/patches/patch-sha256_src_sha2_c
new file mode 100644
index 00000000000..2d4ebf52042
--- /dev/null
+++ b/security/py-cryptkit/patches/patch-sha256_src_sha2_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-sha256_src_sha2_c,v 1.1 2009/03/25 20:14:23 jasper Exp $
+
+Fix potential 64-bit issue due to missing header.
+
+--- sha256/src/sha2.c.orig	Wed Mar 25 21:12:12 2009
++++ sha256/src/sha2.c	Wed Mar 25 21:12:28 2009
+@@ -37,6 +37,7 @@
+  */
+ 
+ 
++#include <stdlib.h>
+ #include <string.h>	/* memcpy()/memset() or bcopy()/bzero() */
+ #include <assert.h>	/* assert() */
+ #include "sha2.h"