diff --git a/_oasis b/_oasis
index 1fef89f..97e1d1f 100644
--- a/_oasis
+++ b/_oasis
@@ -14,6 +14,17 @@ Plugins: DevFiles (0.2), META (0.2)
 Synopsis: utop
 Description: Universal toplevel for OCaml
 
+# +-------------------------------------------------------------------+
+# | The toplevel                                                      |
+# +-------------------------------------------------------------------+
+
+Executable utop
+  Install: true
+  Path: src
+  CompiledObject: byte
+  MainIs: utop.ml
+  BuildDepends: findlib, lambda-term, lwt.syntax
+
 # +-------------------------------------------------------------------+
 # | Misc                                                              |
 # +-------------------------------------------------------------------+
diff --git a/_tags b/_tags
new file mode 100644
index 0000000..788bcad
--- /dev/null
+++ b/_tags
@@ -0,0 +1,7 @@
+# -*- conf -*-
+
+<**/*.ml>: syntax_camlp4o, pkg_lwt.syntax
+<src/*>: use_compiler_libs, pkg_lambda-term
+
+# OASIS_START
+# OASIS_STOP
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
new file mode 100644
index 0000000..f8bea03
--- /dev/null
+++ b/myocamlbuild.ml
@@ -0,0 +1,86 @@
+(*
+ * myocamlbuild.ml
+ * ---------------
+ * Copyright : (c) 2011, Jeremie Dimino <jeremie@dimino.org>
+ * Licence   : BSD3
+ *
+ * This file is a part of utop.
+ *)
+
+(* OASIS_START *)
+(* OASIS_STOP *)
+
+let () =
+  dispatch
+    (fun hook ->
+       dispatch_default hook;
+       match hook with
+         | Before_options ->
+             Options.make_links := false
+
+         | After_rules ->
+             (* Use -linkpkg for creating toplevels *)
+             flag ["ocaml"; "link"; "toplevel"] & A"-linkpkg";
+
+             let env = BaseEnvLight.load () in
+             let stdlib_path = BaseEnvLight.var_get "standard_library" env in
+
+             (* Try to find the path where compiler libraries are: *)
+             let compiler_libs =
+               let stdlib = String.chomp stdlib_path in
+               try
+                 let path =
+                   List.find Pathname.exists [
+                     stdlib / "compiler-libs";
+                     stdlib / "compiler-lib";
+                     stdlib / ".." / "compiler-libs";
+                     stdlib / ".." / "compiler-lib";
+                   ]
+                 in
+                 path :: List.filter Pathname.exists [ path / "typing"; path / "utils"; path / "parsing" ]
+               with Not_found ->
+                 []
+             in
+
+             (* Add directories for compiler-libraries: *)
+             let paths = List.map (fun path -> S[A"-I"; A path]) compiler_libs in
+             List.iter
+               (fun stage -> flag ["ocaml"; stage; "use_compiler_libs"] & S paths)
+               ["compile"; "ocamldep"; "doc"; "link"];
+
+             (* Expunge compiler modules *)
+             rule "toplevel expunge"
+               ~dep:"src/utop_top.top"
+               ~prod:"src/utop.byte"
+               (fun _ _ ->
+                  (* Build the list of dependencies. *)
+                  let deps = Findlib.topological_closure [Findlib.query "lambda-term";
+                                                          Findlib.query "findlib"] in
+                  (* Build the set of locations of dependencies. *)
+                  let locs = List.fold_left (fun set pkg -> StringSet.add pkg.Findlib.location set) StringSet.empty deps in
+                  (* Directories to search for .cmi: *)
+                  let directories = StringSet.add stdlib_path (StringSet.add "src" locs) in
+                  (* Construct the set of modules to keep by listing
+                     .cmi files: *)
+                  let modules =
+                    StringSet.fold
+                      (fun directory set ->
+                         List.fold_left
+                           (fun set fname ->
+                              if Pathname.check_extension fname "cmi" then
+                                StringSet.add (module_name_of_pathname fname) set
+                              else
+                                set)
+                           set
+                           (Array.to_list (Pathname.readdir directory)))
+                      directories StringSet.empty
+                  in
+                  Cmd(S[A(stdlib_path / "expunge");
+                        A"src/utop_top.top";
+                        A"src/utop.byte";
+                        A"Outcometree"; A"Topdirs"; A"Toploop";
+                        S(List.map (fun x -> A x) (StringSet.elements modules))]))
+
+         | _ ->
+             ())
+
diff --git a/setup.ml b/setup.ml
new file mode 100644
index 0000000..0ccbb3c
--- /dev/null
+++ b/setup.ml
@@ -0,0 +1,20 @@
+(*
+ * setup.ml
+ * --------
+ * Copyright : (c) 2011, Jeremie Dimino <jeremie@dimino.org>
+ * Licence   : BSD3
+ *
+ * This file is a part of utop.
+ *)
+
+(* OASIS_START *)
+
+let () =
+  let command = Printf.sprintf "oasis setup-dev -run %s %s" Sys.executable_name (String.concat " " (Array.to_list Sys.argv)) in
+  Printf.eprintf "I: Running command '%s'\n%!" command;
+  exit (Sys.command command)
+;;
+
+(* OASIS_STOP *)
+
+let () = setup ();;
diff --git a/src/utop_main.ml b/src/utop_main.ml
new file mode 100644
index 0000000..705e801
--- /dev/null
+++ b/src/utop_main.ml
@@ -0,0 +1,10 @@
+(*
+ * utop_main.ml
+ * ------------
+ * Copyright : (c) 2011, Jeremie Dimino <jeremie@dimino.org>
+ * Licence   : BSD3
+ *
+ * This file is a part of utop.
+ *)
+
+
diff --git a/src/utop_top.mltop b/src/utop_top.mltop
new file mode 100644
index 0000000..8d618a0
--- /dev/null
+++ b/src/utop_top.mltop
@@ -0,0 +1 @@
+Utop_main