diff --git a/Makefile b/Makefile
index 250b2b1a..15342953 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,46 @@
 # OASIS_START
-# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
+# DO NOT EDIT (digest: 9a60866e2fa295c5e33a3fe33b8f3a32)
 
-SETUP = ocaml setup.ml
+SETUP = ./setup.exe
 
-build: setup.data
+build: setup.data $(SETUP)
 	$(SETUP) -build $(BUILDFLAGS)
 
-doc: setup.data build
+doc: setup.data $(SETUP) build
 	$(SETUP) -doc $(DOCFLAGS)
 
-test: setup.data build
+test: setup.data $(SETUP) build
 	$(SETUP) -test $(TESTFLAGS)
 
-all:
+all: $(SETUP)
 	$(SETUP) -all $(ALLFLAGS)
 
-install: setup.data
+install: setup.data $(SETUP)
 	$(SETUP) -install $(INSTALLFLAGS)
 
-uninstall: setup.data
+uninstall: setup.data $(SETUP)
 	$(SETUP) -uninstall $(UNINSTALLFLAGS)
 
-reinstall: setup.data
+reinstall: setup.data $(SETUP)
 	$(SETUP) -reinstall $(REINSTALLFLAGS)
 
-clean:
+clean: $(SETUP)
 	$(SETUP) -clean $(CLEANFLAGS)
 
-distclean:
+distclean: $(SETUP)
 	$(SETUP) -distclean $(DISTCLEANFLAGS)
+	$(RM) $(SETUP)
 
-setup.data:
+setup.data: $(SETUP)
 	$(SETUP) -configure $(CONFIGUREFLAGS)
 
-configure:
+configure: $(SETUP)
 	$(SETUP) -configure $(CONFIGUREFLAGS)
 
+setup.exe: setup.ml
+	ocamlfind ocamlopt -o $@ -linkpkg -package oasis.dynrun $< || ocamlfind ocamlc -o $@ -linkpkg -package oasis.dynrun $< || true
+	$(RM) setup.cmi setup.cmo setup.cmx setup.o
+
 .PHONY: build doc test all install uninstall reinstall clean distclean configure
 
 # OASIS_STOP
diff --git a/_oasis b/_oasis
index 67e1812b..f9204fb4 100644
--- a/_oasis
+++ b/_oasis
@@ -8,6 +8,7 @@ LicenseFile: LICENSE
 Plugins:     META (0.3), DevFiles (0.3)
 OCamlVersion: >= 4.00.1
 BuildTools:  ocamlbuild
+AlphaFeatures: compiled_setup_ml
 
 Synopsis:    A modular standard library focused on data structures.
 Description:
diff --git a/configure b/configure
index 6acfaeb9..d2a26d17 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # OASIS_START
-# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499)
+# DO NOT EDIT (digest: 6f7b8221311e800a7093dc3b793f67ca)
 set -e
 
 FST=true
@@ -23,5 +23,5 @@ for i in "$@"; do
   esac
 done
 
-ocaml setup.ml -configure "$@"
+make configure CONFIGUREFLAGS="$*"
 # OASIS_STOP
diff --git a/setup.ml b/setup.ml
index fe8169fe..e4c486de 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: 9852805d5c19ca1cb6abefde2dcea323) *)
+(* DO NOT EDIT (digest: 172e37fc4b327922311f6cf9389bc560) *)
 (******************************************************************************)
 (* OASIS: architecture for building OCaml libraries and applications          *)
 (*                                                                            *)
@@ -24,14 +24,7 @@
 (* Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA              *)
 (******************************************************************************)
 
-let () =
-  try
-    Topdirs.dir_directory (Sys.getenv "OCAML_TOPLEVEL_PATH")
-  with Not_found -> ()
-;;
-#use "topfind";;
-#require "oasis.dynrun";;
-open OASISDynRun;;
+open OASISDynRun
 
 (* OASIS_STOP *)
 let () = setup ();;