diff --git a/devel/ocaml-stdio/DESCR b/devel/ocaml-stdio/DESCR
new file mode 100644
index 000000000000..7d366f822d2a
--- /dev/null
+++ b/devel/ocaml-stdio/DESCR
@@ -0,0 +1,2 @@
+Stdio provides input/output functions for OCaml. It re-exports the buffered
+channels of the stdlib distributed with OCaml but with some improvements.
diff --git a/devel/ocaml-stdio/Makefile b/devel/ocaml-stdio/Makefile
new file mode 100644
index 000000000000..fb10017990ff
--- /dev/null
+++ b/devel/ocaml-stdio/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2017/07/21 10:36:03 jaapb Exp $
+
+VERSION=	0.9.0
+GITHUB_PROJECT=	stdio
+GITHUB_TAG=	v${VERSION}
+DISTNAME=	${GITHUB_PROJECT}-${VERSION}
+PKGNAME=	ocaml-${DISTNAME}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=janestreet/}
+
+MAINTAINER=	jaapb@NetBSD.org
+HOMEPAGE=	https://github.com/janestreet/stdio/
+COMMENT=	Standard IO library for OCaml
+LICENSE=	apache-2.0
+
+USE_LANGUAGES=	# none
+OCAML_USE_FINDLIB=	yes
+OCAML_USE_JBUILDER=	yes
+
+.include "../../mk/ocaml.mk"
+.include "../../devel/ocaml-base/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-stdio/PLIST b/devel/ocaml-stdio/PLIST
new file mode 100644
index 000000000000..38e3a302496d
--- /dev/null
+++ b/devel/ocaml-stdio/PLIST
@@ -0,0 +1,32 @@
+@comment $NetBSD: PLIST,v 1.1 2017/07/21 10:36:03 jaapb Exp $
+${OCAML_SITELIB}/stdio/META
+${OCAML_SITELIB}/stdio/import.ml
+${OCAML_SITELIB}/stdio/in_channel.mli
+${OCAML_SITELIB}/stdio/opam
+${OCAML_SITELIB}/stdio/out_channel.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/stdio/stdio.a
+${OCAML_SITELIB}/stdio/stdio.cma
+${OCAML_SITELIB}/stdio/stdio.cmi
+${OCAML_SITELIB}/stdio/stdio.cmt
+${OCAML_SITELIB}/stdio/stdio.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/stdio/stdio.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/stdio/stdio.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/stdio/stdio.cmxs
+${OCAML_SITELIB}/stdio/stdio.mli
+${OCAML_SITELIB}/stdio/stdio__.cmi
+${OCAML_SITELIB}/stdio/stdio__.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/stdio/stdio__.cmx
+${OCAML_SITELIB}/stdio/stdio__.ml-gen
+${OCAML_SITELIB}/stdio/stdio__Import.cmi
+${OCAML_SITELIB}/stdio/stdio__Import.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/stdio/stdio__Import.cmx
+${OCAML_SITELIB}/stdio/stdio__In_channel.cmi
+${OCAML_SITELIB}/stdio/stdio__In_channel.cmt
+${OCAML_SITELIB}/stdio/stdio__In_channel.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/stdio/stdio__In_channel.cmx
+${OCAML_SITELIB}/stdio/stdio__Out_channel.cmi
+${OCAML_SITELIB}/stdio/stdio__Out_channel.cmt
+${OCAML_SITELIB}/stdio/stdio__Out_channel.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/stdio/stdio__Out_channel.cmx
+share/doc/stdio/LICENSE.txt
+share/doc/stdio/README.org
diff --git a/devel/ocaml-stdio/buildlink3.mk b/devel/ocaml-stdio/buildlink3.mk
new file mode 100644
index 000000000000..b525cc938138
--- /dev/null
+++ b/devel/ocaml-stdio/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2017/07/21 10:36:03 jaapb Exp $
+
+BUILDLINK_TREE+=	ocaml-stdio
+
+.if !defined(OCAML_STDIO_BUILDLINK3_MK)
+OCAML_STDIO_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ocaml-stdio+=	ocaml-stdio>=0.9.0
+BUILDLINK_PKGSRCDIR.ocaml-stdio?=	../../devel/ocaml-stdio
+.endif	# OCAML_STDIO_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-ocaml-stdio
diff --git a/devel/ocaml-stdio/distinfo b/devel/ocaml-stdio/distinfo
new file mode 100644
index 000000000000..4a2720bbe889
--- /dev/null
+++ b/devel/ocaml-stdio/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2017/07/21 10:36:03 jaapb Exp $
+
+SHA1 (stdio-0.9.0.tar.gz) = c4799b9706172bfaa2ea79c1c3c279151b3f9f0c
+RMD160 (stdio-0.9.0.tar.gz) = c5bde039048d4375dd5437a625ebb02e6ece732e
+SHA512 (stdio-0.9.0.tar.gz) = a3809272c00653872d02b07b6c133215e06a70a7cbebed8c6c22ba5790ee8cbba17821da7875290c8869dfac22bf3cf248028e2aed2570195ca9b5f63b6ab75d
+Size (stdio-0.9.0.tar.gz) = 9264 bytes