diff --git a/www/eliom/Makefile b/www/eliom/Makefile
index 81c5bd0c08f0..865e3a6aeb0f 100644
--- a/www/eliom/Makefile
+++ b/www/eliom/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2016/09/18 07:16:19 dholland Exp $
+# $NetBSD: Makefile,v 1.15 2016/12/30 11:57:24 jaapb Exp $
 #
 
 GITHUB_PROJECT=	eliom
-DISTNAME=	${GITHUB_PROJECT}-5.0.0
-PKGREVISION=	2
+DISTNAME=	${GITHUB_PROJECT}-6.1.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
@@ -14,14 +13,10 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c
+OCAML_USE_FINDLIB=	yes
 
-DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-DEPENDS+=	js_of_ocaml>=2.2:../../devel/js_of_ocaml # with ocaml-tyxml option
-DEPENDS+=	ocsigen>=2.4:../../www/ocsigen
-DEPENDS+=	ocaml-tyxml>=3:../../textproc/ocaml-tyxml
-DEPENDS+=	ocaml-react>=0.9.3:../../devel/ocaml-react
-DEPENDS+=	ocaml-calendar>=2.03.1:../../time/ocaml-calendar
-DEPENDS+=	ocaml-deriving-ocsigen>=0.6:../../devel/ocaml-deriving-ocsigen
+DEPENDS+=	ocsigen>=2.8:../../www/ocsigen
+DEPENDS+=	ocaml-deriving-ocsigen>=0.7.1:../../devel/ocaml-deriving-ocsigen
 
 .include "../../mk/ocaml.mk"
 
@@ -34,14 +29,17 @@ BUILD_TARGET=	byte
 do-install:
 	cd ${WRKSRC} && opam-installer --install --prefix ${DESTDIR}${PREFIX} --libdir ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR} --docdir ${DESTDIR}${PREFIX}/share/doc eliom.install
 
-.include "../../devel/ocamlbuild/buildlink3.mk"
+.include "../../devel/js_of_ocaml/buildlink3.mk"
+.include "../../devel/ocaml-react/buildlink3.mk"
 .include "../../devel/ocaml-reactiveData/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ocaml-reactiveData+=   ocaml-reactiveData>=0.2
 .include "../../devel/ocaml-optcomp/buildlink3.mk"
 .include "../../devel/ocaml-ppx_tools/buildlink3.mk"
+.include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../misc/ocaml-opam/buildlink3.mk"
 BUILDLINK_DEPMETHOD.ocaml-opam?=    build
 .include "../../net/ocaml-ipaddr/buildlink3.mk"
 .include "../../net/ocamlnet/buildlink3.mk"
 .include "../../security/ocaml-ssl/buildlink3.mk"
+.include "../../textproc/ocaml-tyxml/buildlink3.mk"
+.include "../../time/ocaml-calendar/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/eliom/PLIST b/www/eliom/PLIST
index fadcd4aa2b07..75cc03b24365 100644
--- a/www/eliom/PLIST
+++ b/www/eliom/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/02/06 14:50:22 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/12/30 11:57:24 jaapb Exp $
 bin/eliom-distillery
 bin/eliombuild
 bin/eliomc
@@ -16,7 +16,9 @@ ${OCAML_SITELIB}/eliom/client/client.cma
 ${OCAML_SITELIB}/eliom/client/eliom_bus.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_client.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_client.js
+${OCAML_SITELIB}/eliom/client/eliom_client_core.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_client_main.cmo
+${OCAML_SITELIB}/eliom/client/eliom_client_value.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_comet.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_config.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_content.cmi
@@ -27,14 +29,15 @@ ${OCAML_SITELIB}/eliom/client/eliom_form_sigs.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_lazy.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_lib.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_parameter.cmi
-${OCAML_SITELIB}/eliom/client/eliom_pervasives.cmi
+${OCAML_SITELIB}/eliom/client/eliom_parameter_sigs.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_react.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_registration.cmi
+${OCAML_SITELIB}/eliom/client/eliom_registration_sigs.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_service.cmi
+${OCAML_SITELIB}/eliom/client/eliom_service_sigs.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_shared.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_shared_sigs.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_tools.cmi
-${OCAML_SITELIB}/eliom/client/eliom_tools_common.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_types.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_unwrap.cmi
 ${OCAML_SITELIB}/eliom/client/eliom_uri.cmi
@@ -75,6 +78,10 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/ppx/ppx_eliom_type.cmxs
 ${OCAML_SITELIB}/eliom/ppx/ppx_eliom_type.mli
 ${OCAML_SITELIB}/eliom/server/eliom_bus.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_bus.cmx
+${OCAML_SITELIB}/eliom/server/eliom_client.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_client.cmx
+${OCAML_SITELIB}/eliom/server/eliom_client_value.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_client_value.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_comet.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_comet.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_comet_base.cmx
@@ -104,12 +111,12 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_lib.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_lib_base.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_mkreg.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_mkreg.cmx
+${OCAML_SITELIB}/eliom/server/eliom_notif.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_notif.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_parameter.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_parameter.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_parameter_base.cmx
-${OCAML_SITELIB}/eliom/server/eliom_pervasives.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_pervasives.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_pervasives_base.cmx
+${OCAML_SITELIB}/eliom/server/eliom_parameter_sigs.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_process.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_react.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_react.cmx
@@ -117,21 +124,26 @@ ${OCAML_SITELIB}/eliom/server/eliom_reference.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_reference.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_registration.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_registration.cmx
+${OCAML_SITELIB}/eliom/server/eliom_registration_sigs.cmi
 ${OCAML_SITELIB}/eliom/server/eliom_request_info.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_request_info.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_route.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_route_base.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_runtime.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_service.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_service.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_service_base.cmx
+${OCAML_SITELIB}/eliom/server/eliom_service_sigs.cmi
 ${OCAML_SITELIB}/eliom/server/eliom_shared.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_shared.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_shared_content.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_shared_sigs.cmi
 ${OCAML_SITELIB}/eliom/server/eliom_state.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_state.cmx
+${OCAML_SITELIB}/eliom/server/eliom_syntax.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_syntax.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_tools.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_tools.cmx
-${OCAML_SITELIB}/eliom/server/eliom_tools_common.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_tools_common.cmx
 ${OCAML_SITELIB}/eliom/server/eliom_types.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_types.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliom_types_base.cmx
@@ -144,28 +156,14 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_cli.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_cookies.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_datasess.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_gc.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_naservices.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_pagegen.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_parameters.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_persess.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_sersess.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_services.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_sessadmin.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_sessexpl.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_sessiongroups.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/eliommod_timeouts.cmx
-${OCAML_SITELIB}/eliom/server/extensions/atom_feed.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/atom_feed.cmx
-${OCAML_SITELIB}/eliom/server/extensions/eliom_atom.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/eliom_atom.cmx
-${OCAML_SITELIB}/eliom/server/extensions/eliom_openid.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/eliom_openid.cmx
-${OCAML_SITELIB}/eliom/server/extensions/eliom_s2s.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/eliom_s2s.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/extensions.a
-${OCAML_SITELIB}/eliom/server/extensions/extensions.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/extensions.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/extensions/extensions.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor.a
 ${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor.cma
 ${OCAML_SITELIB}/eliom/server/monitor/eliom_monitor.cmi
@@ -222,16 +220,6 @@ ${OCAML_SITELIB}/eliom/templates/basic.ppx/PROJECT_NAME.conf.in
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/PROJECT_NAME.eliom
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/README
 ${OCAML_SITELIB}/eliom/templates/basic.ppx/static!css!PROJECT_NAME.css
-${OCAML_SITELIB}/eliom/templates/mobile/.ocp-indent
-${OCAML_SITELIB}/eliom/templates/mobile/Makefile
-${OCAML_SITELIB}/eliom/templates/mobile/Makefile.options
-${OCAML_SITELIB}/eliom/templates/mobile/PROJECT_NAME.conf.in
-${OCAML_SITELIB}/eliom/templates/mobile/PROJECT_NAME.eliom
-${OCAML_SITELIB}/eliom/templates/mobile/README
-${OCAML_SITELIB}/eliom/templates/mobile/mobile!PROJECT_NAME.config.xml.in
-${OCAML_SITELIB}/eliom/templates/mobile/static!css!PROJECT_NAME.css
-${OCAML_SITELIB}/eliom/templates/mobile/static!index.html
-${OCAML_SITELIB}/eliom/templates/mobile/static!js!PROJECT_NAME.js
 man/man1/eliom-distillery.1
 man/man1/eliomc.1
 man/man1/eliomcp.1
diff --git a/www/eliom/distinfo b/www/eliom/distinfo
index 51d6fd85728c..0acfde0df024 100644
--- a/www/eliom/distinfo
+++ b/www/eliom/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2016/02/06 14:50:22 jaapb Exp $
+$NetBSD: distinfo,v 1.6 2016/12/30 11:57:24 jaapb Exp $
 
-SHA1 (eliom-5.0.0.tar.gz) = bc9163f433466f7e1ca4b75c04b34775ddefd7ec
-RMD160 (eliom-5.0.0.tar.gz) = 04ebd9c7698eec73faaf1daf314b36a153ad15e7
-SHA512 (eliom-5.0.0.tar.gz) = 1c5297e376c3a46935de369b418638a772304246b73756f8bc052301b48d62a37af527274bf1a05064f33b60ff9dcde057a0030f083136fa4e1c0cfa07f01887
-Size (eliom-5.0.0.tar.gz) = 728278 bytes
+SHA1 (eliom-6.1.0.tar.gz) = eedc665ea19dff176caacf08fcf05c0f56f771b7
+RMD160 (eliom-6.1.0.tar.gz) = bf93f4e0ba89c13052448bb118fd5393ae1b1914
+SHA512 (eliom-6.1.0.tar.gz) = ab389e8023de952f371209c5fe6863240214af559c4ae883dc9d3dc9f353afcc8e38292974c8c0a05c65213fe7dc0b350580c5c8647bba679a5ec0c44859621e
+Size (eliom-6.1.0.tar.gz) = 722881 bytes
 SHA1 (patch-pkg_build.ml) = 8597e17fc869b7a8e93ee30f551a92c694617dbc