diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile
index ec955d0d62d5a..234a26ddcdb31 100644
--- a/devel/ocaml-lwt/Makefile
+++ b/devel/ocaml-lwt/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2015/08/07 11:20:34 jaapb Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/06 11:35:14 jaapb Exp $
 #
 
-DISTNAME=	2.4.5
-PKGNAME=	ocaml-lwt-${DISTNAME}
-PKGREVISION=	3
+DISTNAME=	lwt-2.5.1
 CATEGORIES=	devel
-MASTER_SITES=	http://github.com/ocsigen/lwt/archive/
-DIST_SUBDIR=	ocaml-lwt
-
-WRKSRC=	${WRKDIR}/lwt-${DISTNAME}
+#MASTER_SITES=	http://github.com/ocsigen/lwt/archive/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
+GITHUB_PROJECT=	lwt
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://www.ocsigen.org/
@@ -16,9 +13,11 @@ COMMENT=	Cooperative threading library for OCaml
 LICENSE=	gnu-lgpl-v2.1
 
 DEPENDS=	ocaml-react-[0-9]*:../../devel/ocaml-react
+BUILDLINK_API_DEPENDS.ocaml-ssl+=	ocaml-ssl>=0.5.0
 
 OCAML_USE_OASIS=	yes
-CONFIGURE_ARGS+=	--destdir "${DESTDIR}" --prefix "${PREFIX}" --enable-react --disable-text --disable-glib --disable-toplevel
+CONFIGURE_ARGS+=	--destdir "${DESTDIR}" --prefix "${PREFIX}" --enable-react \
+	--disable-glib --enable-camlp4
 
 SUBST_CLASSES+=		libev destdir
 SUBST_STAGE.libev=	post-configure
diff --git a/devel/ocaml-lwt/PLIST b/devel/ocaml-lwt/PLIST
index 70bc915dc14bc..eca68dc02eab7 100644
--- a/devel/ocaml-lwt/PLIST
+++ b/devel/ocaml-lwt/PLIST
@@ -1,21 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2014/10/09 21:13:36 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/02/06 11:35:14 jaapb Exp $
 @unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/lwt
 ${OCAML_SITELIB}/lwt/META
 ${OCAML_SITELIB}/lwt/dlllwt-unix_stubs.so
 ${OCAML_SITELIB}/lwt/liblwt-unix_stubs.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-extra.a
-${OCAML_SITELIB}/lwt/lwt-extra.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-extra.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-extra.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-log.a
 ${OCAML_SITELIB}/lwt/lwt-log.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-log.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-log.cmxs
-${OCAML_SITELIB}/lwt/lwt_log_core.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_log_core.cmx
-${OCAML_SITELIB}/lwt/lwt_log_core.mli
-${OCAML_SITELIB}/lwt/lwt_log_rules.cmi
-${OCAML_SITELIB}/lwt/lwt_log_rules.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-preemptive.a
 ${OCAML_SITELIB}/lwt/lwt-preemptive.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-preemptive.cmxa
@@ -36,122 +27,205 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-log.a
 ${OCAML_SITELIB}/lwt/lwt-syntax-log.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-log.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-log.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax.a
-${OCAML_SITELIB}/lwt/lwt-syntax.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-options.a
 ${OCAML_SITELIB}/lwt/lwt-syntax-options.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-options.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax-options.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax.a
+${OCAML_SITELIB}/lwt/lwt-syntax.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-syntax.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-unix.a
 ${OCAML_SITELIB}/lwt/lwt-unix.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-unix.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt-unix.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.a
+${OCAML_SITELIB}/lwt/lwt.annot
 ${OCAML_SITELIB}/lwt/lwt.cma
 ${OCAML_SITELIB}/lwt/lwt.cmi
+${OCAML_SITELIB}/lwt/lwt.cmt
+${OCAML_SITELIB}/lwt/lwt.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmxs
 ${OCAML_SITELIB}/lwt/lwt.mli
+${OCAML_SITELIB}/lwt/lwt_bytes.annot
 ${OCAML_SITELIB}/lwt/lwt_bytes.cmi
+${OCAML_SITELIB}/lwt/lwt_bytes.cmt
+${OCAML_SITELIB}/lwt/lwt_bytes.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_bytes.cmx
 ${OCAML_SITELIB}/lwt/lwt_bytes.mli
+${OCAML_SITELIB}/lwt/lwt_chan.annot
 ${OCAML_SITELIB}/lwt/lwt_chan.cmi
+${OCAML_SITELIB}/lwt/lwt_chan.cmt
+${OCAML_SITELIB}/lwt/lwt_chan.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_chan.cmx
 ${OCAML_SITELIB}/lwt/lwt_chan.mli
+${OCAML_SITELIB}/lwt/lwt_condition.annot
 ${OCAML_SITELIB}/lwt/lwt_condition.cmi
+${OCAML_SITELIB}/lwt/lwt_condition.cmt
+${OCAML_SITELIB}/lwt/lwt_condition.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_condition.cmx
 ${OCAML_SITELIB}/lwt/lwt_condition.mli
 ${OCAML_SITELIB}/lwt/lwt_config.h
-${OCAML_SITELIB}/lwt/lwt_config.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_config.cmx
+${OCAML_SITELIB}/lwt/lwt_daemon.annot
 ${OCAML_SITELIB}/lwt/lwt_daemon.cmi
+${OCAML_SITELIB}/lwt/lwt_daemon.cmt
+${OCAML_SITELIB}/lwt/lwt_daemon.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_daemon.cmx
 ${OCAML_SITELIB}/lwt/lwt_daemon.mli
+${OCAML_SITELIB}/lwt/lwt_engine.annot
 ${OCAML_SITELIB}/lwt/lwt_engine.cmi
+${OCAML_SITELIB}/lwt/lwt_engine.cmt
+${OCAML_SITELIB}/lwt/lwt_engine.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_engine.cmx
 ${OCAML_SITELIB}/lwt/lwt_engine.mli
-${OCAML_SITELIB}/lwt/lwt_event.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_event.cmx
-${OCAML_SITELIB}/lwt/lwt_event.mli
+${OCAML_SITELIB}/lwt/lwt_gc.annot
 ${OCAML_SITELIB}/lwt/lwt_gc.cmi
+${OCAML_SITELIB}/lwt/lwt_gc.cmt
+${OCAML_SITELIB}/lwt/lwt_gc.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_gc.cmx
 ${OCAML_SITELIB}/lwt/lwt_gc.mli
+${OCAML_SITELIB}/lwt/lwt_io.annot
 ${OCAML_SITELIB}/lwt/lwt_io.cmi
+${OCAML_SITELIB}/lwt/lwt_io.cmt
+${OCAML_SITELIB}/lwt/lwt_io.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_io.cmx
 ${OCAML_SITELIB}/lwt/lwt_io.mli
-${OCAML_SITELIB}/lwt/lwt_lib.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_lib.cmx
-${OCAML_SITELIB}/lwt/lwt_lib.mli
+${OCAML_SITELIB}/lwt/lwt_list.annot
 ${OCAML_SITELIB}/lwt/lwt_list.cmi
+${OCAML_SITELIB}/lwt/lwt_list.cmt
+${OCAML_SITELIB}/lwt/lwt_list.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_list.cmx
 ${OCAML_SITELIB}/lwt/lwt_list.mli
+${OCAML_SITELIB}/lwt/lwt_log.annot
 ${OCAML_SITELIB}/lwt/lwt_log.cmi
+${OCAML_SITELIB}/lwt/lwt_log.cmt
+${OCAML_SITELIB}/lwt/lwt_log.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_log.cmx
 ${OCAML_SITELIB}/lwt/lwt_log.mli
+${OCAML_SITELIB}/lwt/lwt_log_core.annot
+${OCAML_SITELIB}/lwt/lwt_log_core.cmi
+${OCAML_SITELIB}/lwt/lwt_log_core.cmt
+${OCAML_SITELIB}/lwt/lwt_log_core.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_log_core.cmx
+${OCAML_SITELIB}/lwt/lwt_log_core.mli
+${OCAML_SITELIB}/lwt/lwt_log_rules.annot
+${OCAML_SITELIB}/lwt/lwt_log_rules.cmi
+${OCAML_SITELIB}/lwt/lwt_log_rules.cmt
+${OCAML_SITELIB}/lwt/lwt_log_rules.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_log_rules.cmx
+${OCAML_SITELIB}/lwt/lwt_log_rules.mli
+${OCAML_SITELIB}/lwt/lwt_main.annot
 ${OCAML_SITELIB}/lwt/lwt_main.cmi
+${OCAML_SITELIB}/lwt/lwt_main.cmt
+${OCAML_SITELIB}/lwt/lwt_main.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_main.cmx
 ${OCAML_SITELIB}/lwt/lwt_main.mli
+${OCAML_SITELIB}/lwt/lwt_mutex.annot
 ${OCAML_SITELIB}/lwt/lwt_mutex.cmi
+${OCAML_SITELIB}/lwt/lwt_mutex.cmt
+${OCAML_SITELIB}/lwt/lwt_mutex.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_mutex.cmx
 ${OCAML_SITELIB}/lwt/lwt_mutex.mli
+${OCAML_SITELIB}/lwt/lwt_mvar.annot
 ${OCAML_SITELIB}/lwt/lwt_mvar.cmi
+${OCAML_SITELIB}/lwt/lwt_mvar.cmt
+${OCAML_SITELIB}/lwt/lwt_mvar.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_mvar.cmx
 ${OCAML_SITELIB}/lwt/lwt_mvar.mli
+${OCAML_SITELIB}/lwt/lwt_pool.annot
 ${OCAML_SITELIB}/lwt/lwt_pool.cmi
+${OCAML_SITELIB}/lwt/lwt_pool.cmt
+${OCAML_SITELIB}/lwt/lwt_pool.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_pool.cmx
 ${OCAML_SITELIB}/lwt/lwt_pool.mli
+${OCAML_SITELIB}/lwt/lwt_pqueue.annot
 ${OCAML_SITELIB}/lwt/lwt_pqueue.cmi
+${OCAML_SITELIB}/lwt/lwt_pqueue.cmt
+${OCAML_SITELIB}/lwt/lwt_pqueue.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_pqueue.cmx
 ${OCAML_SITELIB}/lwt/lwt_pqueue.mli
+${OCAML_SITELIB}/lwt/lwt_preemptive.annot
 ${OCAML_SITELIB}/lwt/lwt_preemptive.cmi
+${OCAML_SITELIB}/lwt/lwt_preemptive.cmt
+${OCAML_SITELIB}/lwt/lwt_preemptive.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_preemptive.cmx
 ${OCAML_SITELIB}/lwt/lwt_preemptive.mli
+${OCAML_SITELIB}/lwt/lwt_process.annot
 ${OCAML_SITELIB}/lwt/lwt_process.cmi
+${OCAML_SITELIB}/lwt/lwt_process.cmt
+${OCAML_SITELIB}/lwt/lwt_process.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_process.cmx
 ${OCAML_SITELIB}/lwt/lwt_process.mli
+${OCAML_SITELIB}/lwt/lwt_react.annot
 ${OCAML_SITELIB}/lwt/lwt_react.cmi
+${OCAML_SITELIB}/lwt/lwt_react.cmt
+${OCAML_SITELIB}/lwt/lwt_react.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_react.cmx
 ${OCAML_SITELIB}/lwt/lwt_react.mli
+${OCAML_SITELIB}/lwt/lwt_sequence.annot
 ${OCAML_SITELIB}/lwt/lwt_sequence.cmi
+${OCAML_SITELIB}/lwt/lwt_sequence.cmt
+${OCAML_SITELIB}/lwt/lwt_sequence.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_sequence.cmx
 ${OCAML_SITELIB}/lwt/lwt_sequence.mli
-${OCAML_SITELIB}/lwt/lwt_signal.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_signal.cmx
-${OCAML_SITELIB}/lwt/lwt_signal.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_simple_top.cmx
+${OCAML_SITELIB}/lwt/lwt_ssl.annot
 ${OCAML_SITELIB}/lwt/lwt_ssl.cmi
+${OCAML_SITELIB}/lwt/lwt_ssl.cmt
+${OCAML_SITELIB}/lwt/lwt_ssl.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_ssl.cmx
 ${OCAML_SITELIB}/lwt/lwt_ssl.mli
+${OCAML_SITELIB}/lwt/lwt_stream.annot
 ${OCAML_SITELIB}/lwt/lwt_stream.cmi
+${OCAML_SITELIB}/lwt/lwt_stream.cmt
+${OCAML_SITELIB}/lwt/lwt_stream.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_stream.cmx
 ${OCAML_SITELIB}/lwt/lwt_stream.mli
+${OCAML_SITELIB}/lwt/lwt_switch.annot
 ${OCAML_SITELIB}/lwt/lwt_switch.cmi
+${OCAML_SITELIB}/lwt/lwt_switch.cmt
+${OCAML_SITELIB}/lwt/lwt_switch.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_switch.cmx
 ${OCAML_SITELIB}/lwt/lwt_switch.mli
+${OCAML_SITELIB}/lwt/lwt_sys.annot
 ${OCAML_SITELIB}/lwt/lwt_sys.cmi
+${OCAML_SITELIB}/lwt/lwt_sys.cmt
+${OCAML_SITELIB}/lwt/lwt_sys.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_sys.cmx
 ${OCAML_SITELIB}/lwt/lwt_sys.mli
+${OCAML_SITELIB}/lwt/lwt_throttle.annot
 ${OCAML_SITELIB}/lwt/lwt_throttle.cmi
+${OCAML_SITELIB}/lwt/lwt_throttle.cmt
+${OCAML_SITELIB}/lwt/lwt_throttle.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_throttle.cmx
 ${OCAML_SITELIB}/lwt/lwt_throttle.mli
+${OCAML_SITELIB}/lwt/lwt_timeout.annot
 ${OCAML_SITELIB}/lwt/lwt_timeout.cmi
+${OCAML_SITELIB}/lwt/lwt_timeout.cmt
+${OCAML_SITELIB}/lwt/lwt_timeout.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_timeout.cmx
 ${OCAML_SITELIB}/lwt/lwt_timeout.mli
+${OCAML_SITELIB}/lwt/lwt_unix.annot
 ${OCAML_SITELIB}/lwt/lwt_unix.cmi
+${OCAML_SITELIB}/lwt/lwt_unix.cmt
+${OCAML_SITELIB}/lwt/lwt_unix.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_unix.cmx
 ${OCAML_SITELIB}/lwt/lwt_unix.h
 ${OCAML_SITELIB}/lwt/lwt_unix.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_unix_jobs_generated.cmx
-${OCAML_SITELIB}/lwt/lwt_util.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_util.cmx
-${OCAML_SITELIB}/lwt/lwt_util.mli
+${OCAML_SITELIB}/lwt/pa_lwt.annot
 ${OCAML_SITELIB}/lwt/pa_lwt.cmi
+${OCAML_SITELIB}/lwt/pa_lwt.cmt
+${OCAML_SITELIB}/lwt/pa_lwt.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/pa_lwt.cmx
 ${OCAML_SITELIB}/lwt/pa_lwt.mli
+${OCAML_SITELIB}/lwt/pa_lwt_log.annot
 ${OCAML_SITELIB}/lwt/pa_lwt_log.cmi
+${OCAML_SITELIB}/lwt/pa_lwt_log.cmt
+${OCAML_SITELIB}/lwt/pa_lwt_log.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/pa_lwt_log.cmx
 ${OCAML_SITELIB}/lwt/pa_lwt_log.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/pa_lwt_options.cmx
diff --git a/devel/ocaml-lwt/distinfo b/devel/ocaml-lwt/distinfo
index 971ffd61e5683..5d04933b886e8 100644
--- a/devel/ocaml-lwt/distinfo
+++ b/devel/ocaml-lwt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 03:27:52 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/02/06 11:35:14 jaapb Exp $
 
-SHA1 (ocaml-lwt/2.4.5.tar.gz) = 863b651a3917880a0a44e09bce153ca4bb31a84d
-RMD160 (ocaml-lwt/2.4.5.tar.gz) = dfe2f0d257064f6fc31dd72be7b55b219b2a0833
-SHA512 (ocaml-lwt/2.4.5.tar.gz) = 484dfab5e2ad4cf34b0dfa8c8df8a10870acf5dfc74c164ba581a4ea8f7d6c9b4b6b94e5e38ef49d60d031cb693a1f04ebad175af99b6f2b6190c9ae7101b217
-Size (ocaml-lwt/2.4.5.tar.gz) = 298612 bytes
+SHA1 (lwt-2.5.1.tar.gz) = 789cf09378b4f70c868003996bd9d3361d7fc196
+RMD160 (lwt-2.5.1.tar.gz) = c075603ab875c3108957719ce3ff26796ceb1bc7
+SHA512 (lwt-2.5.1.tar.gz) = 648f08e13a5b13072ed44ec380cce226bbf2ac480ca6adcd170e5bfa789bf6a4e832af0748bb1bff0e45611fd8d1b14592ece4211fb78be5b03cbcd7c3cb3b7d
+Size (lwt-2.5.1.tar.gz) = 1272834 bytes