diff --git a/Makefile b/Makefile
index 3796bae5..474428bd 100644
--- a/Makefile
+++ b/Makefile
@@ -49,10 +49,6 @@ examples: all
 
 push_doc: doc
 	scp -r containers.docdir/* cedeela.fr:~/simon/root/software/containers/
-	scp -r containers_string.docdir/* cedeela.fr:~/simon/root/software/containers/string/
-	scp -r containers_advanced.docdir/* cedeela.fr:~/simon/root/software/containers/advanced
-	scp -r containers_misc.docdir/* cedeela.fr:~/simon/root/software/containers/misc/
-	scp -r containers_lwt.docdir/* cedeela.fr:~/simon/root/software/containers/lwt/
 
 DONTTEST=myocamlbuild.ml setup.ml $(wildcard src/**/*.cppo.*)
 QTESTABLE=$(filter-out $(DONTTEST), \
diff --git a/_oasis b/_oasis
index ab2a2d77..a48c84d3 100644
--- a/_oasis
+++ b/_oasis
@@ -41,6 +41,10 @@ Flag "bigarray"
   Description:  Build modules that depend on bigarrays
   Default:      false
 
+Flag "advanced"
+  Description:  Build advanced combinators, including CCLinq (requires "sequence")
+  Default:      true
+
 Library "containers"
   Path:             src/core
   Modules:          CCVector, CCPrint, CCError, CCHeap, CCList, CCOpt, CCPair,
@@ -86,6 +90,8 @@ Library "containers_advanced"
   Path:             src/advanced
   Pack:             true
   Modules:          CCLinq, CCBatch, CCCat, CCMonadIO
+  Build$:           flag(advanced)
+  Install$:         flag(advanced)
   FindlibName:      advanced
   FindlibParent:    containers
   BuildDepends:     containers, sequence
diff --git a/doc/intro.txt b/doc/intro.txt
index afde017d..2615a2c5 100644
--- a/doc/intro.txt
+++ b/doc/intro.txt
@@ -101,7 +101,8 @@ Use bigarrays to hold large strings and map files directly into memory.
 
 {4 Advanced}
 
-This module is qualified with [Containers_advanced].
+This module is qualified with [Containers_advanced]. It
+requires {{:https://github.com/c-cube/sequence} Sequence}.
 
 {!modules: CCLinq CCCat CCBatch}
 
diff --git a/opam b/opam
index e20b12c0..8028d27d 100644
--- a/opam
+++ b/opam
@@ -5,6 +5,7 @@ build: [
     ["./configure" "--prefix" prefix "--disable-thread" "--disable-bench"
         "--disable-tests" "--%{lwt:enable}%-lwt"
         "--%{base-bigarray:enable}%-bigarray"
+        "--%{sequence:enable}%-advanced"
         "--enable-docs" "--enable-misc"]
     [make "build"]
 ]
@@ -27,7 +28,7 @@ depends: [
     "base-bytes"
     "cppo" {build}
 ]
-depopts: [ "lwt" ]
+depopts: [ "lwt" "sequence" "base-bigarray" ]
 tags: [ "stdlib" "containers" "iterators" "list" "heap" "queue" ]
 homepage: "https://github.com/c-cube/ocaml-containers/"
 doc: "http://cedeela.fr/~simon/software/containers/"
diff --git a/setup.ml b/setup.ml
index 74763e94..9326135d 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.4 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 43c616e040b0bb8b601c67da9e06ec15) *)
+(* DO NOT EDIT (digest: e891037c225152a20947db1a246bbac5) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6989,6 +6989,18 @@ let setup_t =
                         Some "Build modules that depend on bigarrays";
                       flag_default = [(OASISExpr.EBool true, false)]
                    });
+               Flag
+                 ({
+                     cs_name = "advanced";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = []
+                  },
+                   {
+                      flag_description =
+                        Some
+                          "Build advanced combinators, including CCLinq (requires \"sequence\")";
+                      flag_default = [(OASISExpr.EBool true, true)]
+                   });
                Library
                  ({
                      cs_name = "containers";
@@ -7208,8 +7220,16 @@ let setup_t =
                      cs_plugin_data = []
                   },
                    {
-                      bs_build = [(OASISExpr.EBool true, true)];
-                      bs_install = [(OASISExpr.EBool true, true)];
+                      bs_build =
+                        [
+                           (OASISExpr.EBool true, false);
+                           (OASISExpr.EFlag "advanced", true)
+                        ];
+                      bs_install =
+                        [
+                           (OASISExpr.EBool true, false);
+                           (OASISExpr.EFlag "advanced", true)
+                        ];
                       bs_path = "src/advanced";
                       bs_compiled_object = Best;
                       bs_build_depends =
@@ -7886,8 +7906,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest =
-       Some "\031\146\017A\213\149\236\192\252\238\156-\202*`\143";
+     oasis_digest = Some "\1605\244ig\016\132\177^\002\249\198\135@\146\016";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
@@ -7895,6 +7914,6 @@ let setup_t =
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7899 "setup.ml"
+# 7918 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;