diff --git a/security/cryptokit/Makefile b/security/cryptokit/Makefile
index 294cfe8fbbd..93eb5007cfb 100644
--- a/security/cryptokit/Makefile
+++ b/security/cryptokit/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/07/21 02:39:46 avsm Exp $
+# $OpenBSD: Makefile,v 1.2 2003/07/22 20:11:47 sturm Exp $
 
 COMMENT=	"cryptographic framework for the Objective-ML language"
 CATEGORIES=	security
 
 DISTNAME=	cryptokit-1.2
+PKGNAME=	${DISTNAME}p0
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
 
 MAINTAINER=	Anil Madhavapeddy <avsm@openbsd.org>
@@ -15,21 +16,22 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
-BUILD_DEPENDS=	:ocaml-*:lang/ocaml
+MODULES=	ocaml
 
 OCAML_LIBDIR=	${PREFIX}/lib/ocaml
 DOC_DIR=	${PREFIX}/share/doc/cryptokit
 MAKE_FLAGS=	CFLAGS="${CFLAGS} -DHAVE_ZLIB"
 FAKE_FLAGS=	INSTALLDIR="${DESTDIR}${OCAML_LIBDIR}"
 
+ALL_TARGET=	all ${MODOCAML_NATIVE:S,Yes,allopt,:S,No,,}
+
 REGRESS_TARGET=	test
 
-do-install:
+pre-install:
 	${INSTALL_DATA_DIR} ${OCAML_LIBDIR}
+
+post-install:
 	${INSTALL_DATA_DIR} ${DOC_DIR}
-.for i in cryptokit.cmi cryptokit.cma cryptokit.mli libcryptokit.a
-	${INSTALL_DATA} ${WRKBUILD}/${i} ${OCAML_LIBDIR}
-.endfor
 	${LOCALBASE}/bin/ocamldoc -html -I ${WRKSRC} -d ${DOC_DIR} ${WRKSRC}/cryptokit.mli
 
 .include <bsd.port.mk>
diff --git a/security/cryptokit/patches/patch-Makefile b/security/cryptokit/patches/patch-Makefile
index 780d9fbada2..4f975d05254 100644
--- a/security/cryptokit/patches/patch-Makefile
+++ b/security/cryptokit/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2003/07/21 02:39:46 avsm Exp $
---- Makefile.orig	Thu Jul 10 10:47:17 2003
-+++ Makefile	Fri Jul 18 15:26:53 2003
+$OpenBSD: patch-Makefile,v 1.2 2003/07/22 20:11:47 sturm Exp $
+--- Makefile.orig	Thu Jul 10 16:46:55 2003
++++ Makefile	Tue Jul 22 19:04:16 2003
 @@ -14,9 +14,6 @@ ZLIB_LIBDIR=/usr/lib
  # The directory containing the Zlib header file (zlib.h)
  ZLIB_INCLUDE=/usr/include
@@ -11,7 +11,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2003/07/21 02:39:46 avsm Exp $
  # Flags for the C compiler.
  CFLAGS=-O -I$(ZLIB_INCLUDE) $(ZLIB)
  
-@@ -55,7 +52,7 @@ cryptokit.cmxa: $(CAML_OBJS:.cmo=.cmx)
+@@ -55,10 +52,10 @@ cryptokit.cmxa: $(CAML_OBJS:.cmo=.cmx)
  	$(MKLIB) -o cryptokit $(CAML_OBJS:.cmo=.cmx) -L$(ZLIB_LIBDIR) $(ZLIB_LIB)
  
  test: test.byt
@@ -19,4 +19,8 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2003/07/21 02:39:46 avsm Exp $
 +	./test.byt
  
  test.byt: libcryptokit.a cryptokit.cma test.ml
- 	$(OCAMLC) -o test.byt unix.cma nums.cma cryptokit.cma test.ml
+-	$(OCAMLC) -o test.byt unix.cma nums.cma cryptokit.cma test.ml
++	$(OCAMLC) -I . -o test.byt unix.cma nums.cma cryptokit.cma test.ml
+ 
+ clean::
+ 	rm -f test.byt
diff --git a/security/cryptokit/pkg/PFRAG.native b/security/cryptokit/pkg/PFRAG.native
new file mode 100644
index 00000000000..3b216fa33ec
--- /dev/null
+++ b/security/cryptokit/pkg/PFRAG.native
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PFRAG.native,v 1.1 2003/07/22 20:11:47 sturm Exp $
+lib/ocaml/cryptokit.a
+lib/ocaml/cryptokit.cmx
+lib/ocaml/cryptokit.cmxa
diff --git a/security/cryptokit/pkg/PLIST b/security/cryptokit/pkg/PLIST
index b8f29d03aed..7afbe6c17f9 100644
--- a/security/cryptokit/pkg/PLIST
+++ b/security/cryptokit/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/07/21 02:39:46 avsm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2003/07/22 20:11:47 sturm Exp $
+%%native%%
 lib/ocaml/cryptokit.cma
 lib/ocaml/cryptokit.cmi
 lib/ocaml/cryptokit.mli
@@ -89,3 +90,4 @@ share/doc/cryptokit/type_Cryptokit.hash.html
 share/doc/cryptokit/type_Cryptokit.html
 share/doc/cryptokit/type_Cryptokit.transform.html
 @dirrm share/doc/cryptokit
+@comment @dirrm lib/ocaml