diff --git a/scripts/buildRuntime.sh b/scripts/buildRuntime.sh
index 5d794a7321..42ace88baf 100755
--- a/scripts/buildRuntime.sh
+++ b/scripts/buildRuntime.sh
@@ -2,16 +2,12 @@
 set -e
 shopt -s extglob
 
-(cd runtime && ../cli/rescript.js clean)
+(cd runtime && ../cli/rescript.js clean && ../cli/rescript.js build)
 
 rm -f lib/es6/*.js lib/js/*.js lib/ocaml/*
 mkdir -p lib/es6 lib/js lib/ocaml
-mkdir -p runtime/lib/es6 runtime/lib/js
 
-(cd runtime && ../cli/rescript.js build)
-
-cp runtime/lib/es6/!(Pervasives_mini).js lib/es6
-cp runtime/lib/js/!(Pervasives_mini).js lib/js
-cp runtime/lib/bs/!(Pervasives_mini|Belt_internal*).cmi lib/ocaml/
-cp runtime/lib/bs/!(Pervasives_mini).@(cmi|cmj|cmt|cmti) lib/ocaml/
-cp runtime/!(Pervasives_mini).@(res|resi) lib/ocaml/
+cp runtime/lib/es6/*.js lib/es6
+cp runtime/lib/js/*.js lib/js
+cp runtime/lib/bs/*.@(cmi|cmj|cmt|cmti) lib/ocaml/
+cp runtime/*.@(res|resi) lib/ocaml/
diff --git a/scripts/buildRuntimeRewatch.sh b/scripts/buildRuntimeRewatch.sh
index 38d139d012..bb8d97fc56 100755
--- a/scripts/buildRuntimeRewatch.sh
+++ b/scripts/buildRuntimeRewatch.sh
@@ -2,16 +2,12 @@
 set -e
 shopt -s extglob
 
-(cd runtime && ../cli/rewatch.js clean)
+(cd runtime && ../cli/rewatch.js clean && ../cli/rewatch.js build)
 
 rm -f lib/es6/*.js lib/js/*.js lib/ocaml/*
 mkdir -p lib/es6 lib/js lib/ocaml
-mkdir -p runtime/lib/es6 runtime/lib/js
 
-(cd runtime && ../cli/rewatch.js build)
-
-cp runtime/lib/es6/!(Pervasives_mini).js lib/es6
-cp runtime/lib/js/!(Pervasives_mini).js lib/js
-cp runtime/lib/bs/!(Pervasives_mini|Belt_internal*).cmi lib/ocaml/
-cp runtime/lib/bs/!(Pervasives_mini).@(cmi|cmj|cmt|cmti) lib/ocaml/
-cp runtime/!(Pervasives_mini).@(res|resi) lib/ocaml/
\ No newline at end of file
+cp runtime/lib/es6/*.js lib/es6
+cp runtime/lib/js/*.js lib/js
+cp runtime/lib/bs/*.@(cmi|cmj|cmt|cmti) lib/ocaml/
+cp runtime/*.@(res|resi) lib/ocaml/