diff --git a/contrib/aim/load.factor b/contrib/aim/load.factor
index 89114b5940..fcfc45ea39 100644
--- a/contrib/aim/load.factor
+++ b/contrib/aim/load.factor
@@ -1,9 +1,9 @@
 IN: scratchpad
 USING: kernel parser sequences words compiler ;
+
 "contrib/crypto/load.factor" run-file
 
-{ "net-bytes" "aim" }
-[ "contrib/aim/" swap ".factor" append3 run-file ]
-
-{ "aim-internals" "aim" }
-[ words [ try-compile ] each ] each
+{ 
+    "net-bytes"
+    "aim"
+} [ "contrib/aim/" swap ".factor" append3 run-file ]
diff --git a/contrib/cairo/load.factor b/contrib/cairo/load.factor
index 05f8309581..48613bbbfc 100644
--- a/contrib/cairo/load.factor
+++ b/contrib/cairo/load.factor
@@ -1,13 +1,13 @@
 IN: scratchpad
 USING: alien kernel parser compiler words sequences ;
 
-{ { "cairo" "libcairo" }
-  { "sdl-gfx" "libSDL_gfx" }
-  { "sdl" "libSDL" } }
-[ first2 add-simple-library ] each
+{ 
+    { "cairo" "libcairo" }
+    { "sdl-gfx" "libSDL_gfx" }
+    { "sdl" "libSDL" }
+} [ first2 add-simple-library ] each
 
-{ "cairo" "cairo_sdl" }
-[ "contrib/cairo/" swap ".factor" append3 run-file ] each
-
-{ "cairo" "cairo-sdl" }
-[ words [ try-compile ] each ] each
+{ 
+    "cairo"
+    "cairo_sdl"
+} [ "contrib/cairo/" swap ".factor" append3 run-file ] each
diff --git a/contrib/concurrency/load.factor b/contrib/concurrency/load.factor
index f2c2953385..cfbe26f4d2 100644
--- a/contrib/concurrency/load.factor
+++ b/contrib/concurrency/load.factor
@@ -4,7 +4,7 @@ USING: kernel parser compiler words sequences ;
 "contrib/dlists.factor" run-file
 "contrib/math/load.factor" run-file
 
-{ "concurrency" "concurrency-examples" }
-dup
-[ "contrib/concurrency/" swap ".factor" append3 run-file ] each
-[ words [ try-compile ] each ] each
+{ 
+    "concurrency"
+    "concurrency-examples"
+} [ "contrib/concurrency/" swap ".factor" append3 run-file ] each
diff --git a/contrib/cont-responder/load.factor b/contrib/cont-responder/load.factor
index 74d7d03dbe..ed24bd653f 100644
--- a/contrib/cont-responder/load.factor
+++ b/contrib/cont-responder/load.factor
@@ -1,11 +1,16 @@
 IN: scratchpad
 USING: words kernel parser sequences io compiler ;
+
 "contrib/httpd/load.factor" run-file
 "contrib/parser-combinators/load.factor" run-file
 
-{ "cont-examples" "cont-numbers-game" "todo" "todo-example" "live-updater" "eval-responder" "live-updater-responder" "cont-testing" }
-[ "contrib/cont-responder/" swap ".factor" append3 run-file ] each
-
-{ "cont-examples" "numbers-game" "cont-responder" "eval-responder" "live-updater-responder" "live-updater" "todo-example" "todo" }
-[ words [ try-compile ] each ] each
-
+{ 
+    "cont-examples"
+    "cont-numbers-game"
+    "todo"
+    "todo-example"
+    "live-updater"
+    "eval-responder"
+    "live-updater-responder"
+    "cont-testing"
+} [ "contrib/cont-responder/" swap ".factor" append3 run-file ] each
diff --git a/contrib/crypto/load.factor b/contrib/crypto/load.factor
index 614a111fc8..8efa13cf2e 100644
--- a/contrib/crypto/load.factor
+++ b/contrib/crypto/load.factor
@@ -1,8 +1,10 @@
 IN: scratchpad
 USING: kernel parser sequences words compiler ;
+
 "contrib/math/load.factor" run-file
 
-{ "common" "md5" "sha1" }
-[ "contrib/crypto/" swap ".factor" append3 run-file ] each
-
-"crypto" words [ try-compile ] each
+{
+    "common"
+    "md5"
+    "sha1"
+} [ "contrib/crypto/" swap ".factor" append3 run-file ] each
diff --git a/contrib/httpd/load.factor b/contrib/httpd/load.factor
index f8c26eec49..e46a6dc4a6 100644
--- a/contrib/httpd/load.factor
+++ b/contrib/httpd/load.factor
@@ -1,8 +1,21 @@
 IN: scratchpad
 USING: words kernel parser sequences io compiler ;
-{ "http-common" "mime" "html-tags" "html" "responder" "httpd" "file-responder" "cont-responder" "browser-responder" "default-responders" "http-client" 
-  "test/html" "test/http-client" "test/httpd" "test/url-encoding" }
-[ "contrib/httpd/" swap ".factor" append3 run-file ] each
 
-{ "browser-responder" "cont-responder" "httpd" "file-responder" "html" "http-client" "http" "xml" }
-[ words [ try-compile ] each ] each
+{ 
+    "http-common"
+    "mime"
+    "html-tags"
+    "html"
+    "responder"
+    "httpd"
+    "file-responder"
+    "cont-responder"
+    "browser-responder"
+    "default-responders"
+    "http-client"
+
+    "test/html"
+    "test/http-client"
+    "test/httpd"
+    "test/url-encoding"
+} [ "contrib/httpd/" swap ".factor" append3 run-file ] each
diff --git a/contrib/load.factor b/contrib/load.factor
index 35c833c3f0..a7a4020be1 100644
--- a/contrib/load.factor
+++ b/contrib/load.factor
@@ -1,26 +1,26 @@
 ! Load all contrib libs, compile them, and save a new image.
 IN: scratchpad
-USING: alien kernel words sequences parser compiler memory ;
+USING: alien compiler kernel memory parser sequences words ;
 
-! digraph dependencies {
-!   // run-file libs in the correct order to avoid repeated run-filing
-!   aim -> crypto
-!   concurrency -> dlists
-!   concurrency -> math
-!   cont-responder -> httpd
-!   crypto -> math
-!   factor -> x11
-!   space-invaders -> parser-combinators
-!   cont-responder -> parser-combinators
-! }
+{ 
+    "coroutines"
+    "dlists"
+    "splay-trees"
+} [ "contrib/" swap ".factor" append3 run-file clear ] each
 
-{ "coroutines" "dlists" "splay-trees" }
-[ dup
-  "contrib/" swap ".factor" append3 run-file
-   words [ try-compile ] each ] each
-
-{ "cairo" "math" "concurrency" "crypto" "aim" "httpd" "units" "sqlite" "win32" "x11" ! "factory" has a C component, ick.
-  "postgresql" "parser-combinators" "cont-responder" "space-invaders"
-} [ "contrib/" swap "/load.factor" append3 run-file ] each
-
-compile-all
+{ "cairo"
+  "math"
+  "concurrency"
+  "crypto"
+  "aim"
+  "httpd"
+  "units"
+  "sqlite"
+  "win32"
+  "x11"
+  ! "factory" has a C component, ick.
+  "postgresql"
+  "parser-combinators"
+  "cont-responder"
+  "space-invaders"
+} [ "contrib/" swap "/load.factor" append3 run-file clear ] each
diff --git a/contrib/math/load.factor b/contrib/math/load.factor
index 5f69577e22..ccf5b80e41 100644
--- a/contrib/math/load.factor
+++ b/contrib/math/load.factor
@@ -1,7 +1,13 @@
 IN: scratchpad
 USING: kernel parser sequences words compiler ;
-{ "utils" "combinatorics" "analysis" "polynomials" "quaternions" "matrices" "statistics" "numerical-integration" }
-[ "contrib/math/" swap ".factor" append3 run-file ] each
-
-"math-contrib" words [ try-compile ] each
 
+{ 
+    "utils"
+    "combinatorics"
+    "analysis"
+    "polynomials"
+    "quaternions"
+    "matrices"
+    "statistics"
+    "numerical-integration"
+} [ "contrib/math/" swap ".factor" append3 run-file ] each
diff --git a/contrib/parser-combinators/load.factor b/contrib/parser-combinators/load.factor
index 1cc873d17b..470c6de500 100644
--- a/contrib/parser-combinators/load.factor
+++ b/contrib/parser-combinators/load.factor
@@ -1,8 +1,9 @@
 IN: scratchpad
 USING: kernel parser sequences words compiler ;
 
-{ "lazy" "parser-combinators" "lazy-examples" "tests" }
-[ "contrib/parser-combinators/" swap ".factor" append3 run-file ] each
-
-{ "lazy" "lazy-examples" "parser-combinators" }
-[ words [ try-compile ] each ] each
+{
+    "lazy"
+    "parser-combinators"
+    "lazy-examples"
+    "tests"
+} [ "contrib/parser-combinators/" swap ".factor" append3 run-file ] each
diff --git a/contrib/postgresql/load.factor b/contrib/postgresql/load.factor
index 88eeefbbdd..2e15f1c86e 100644
--- a/contrib/postgresql/load.factor
+++ b/contrib/postgresql/load.factor
@@ -1,8 +1,11 @@
 IN: scratchpad
 USING: alien compiler kernel parser sequences words ;
+
 "postgresql" "libpq" add-simple-library
-{ "libpq" "postgresql" "postgresql-test" ! "private" ! Put your password in this file
+
+{
+    "libpq"
+    "postgresql"
+    "postgresql-test"
+    ! "private" ! Put your password in this file
 } [ "contrib/postgresql/" swap ".factor" append3 run-file ] each
-
-"postgresql" words [ try-compile ] each
-
diff --git a/contrib/space-invaders/load.factor b/contrib/space-invaders/load.factor
index 2f5c3ba58b..a222d190d8 100644
--- a/contrib/space-invaders/load.factor
+++ b/contrib/space-invaders/load.factor
@@ -1,11 +1,9 @@
 IN: scratchpad
 USING: kernel parser compiler words sequences io ;
+
 "contrib/parser-combinators/load.factor" run-file
 
-{ "cpu-8080" "space-invaders" }
-[ "contrib/space-invaders/" swap ".factor" append3 run-file ] each
-
-{ "cpu-8080" "space-invaders" }
-[ words [ try-compile ] each ] each
-
-"Use 'run' in the 'space-invaders' vocabulary to start." print
+{
+    "cpu-8080"
+    "space-invaders"
+} [ "contrib/space-invaders/" swap ".factor" append3 run-file ] each
diff --git a/contrib/sqlite/load.factor b/contrib/sqlite/load.factor
index 028f304cb9..2a80b829fe 100644
--- a/contrib/sqlite/load.factor
+++ b/contrib/sqlite/load.factor
@@ -1,9 +1,11 @@
 IN: scratchpad
 USING: kernel alien parser compiler words sequences ;
+
 "sqlite" "libsqlite3" add-simple-library
 
-{ "sqlite" "tuple-db" "test" "tuple-db-tests" }
-[ "contrib/sqlite/" swap ".factor" append3 run-file ] each
-
-{ "sqlite" "tuple-db" }
-[ words [ try-compile ] each ] each
+{
+    "sqlite"
+    "tuple-db"
+    "test"
+    "tuple-db-tests"
+} [ "contrib/sqlite/" swap ".factor" append3 run-file ] each
diff --git a/contrib/units/load.factor b/contrib/units/load.factor
index a3199b6dce..c24c6a1984 100644
--- a/contrib/units/load.factor
+++ b/contrib/units/load.factor
@@ -1,8 +1,8 @@
 IN: scratchpad
 USING: kernel parser sequences words compiler ;
-{ "dimensioned" "si-units" "constants" }
-[ "contrib/units/" swap ".factor" append3 run-file ] each
-
-{ "units-internal" "units" "si-units" }
-[ words [ try-compile ] each ] each
 
+{ 
+    "dimensioned"
+    "si-units"
+    "constants"
+} [ "contrib/units/" swap ".factor" append3 run-file ] each
diff --git a/contrib/win32/load.factor b/contrib/win32/load.factor
index ac8eea3df7..3a19182e3a 100644
--- a/contrib/win32/load.factor
+++ b/contrib/win32/load.factor
@@ -1,11 +1,14 @@
 IN: scratchpad
 USING: alien compiler kernel parser sequences words ;
 
-{ { "user" "user32" }
-  { "kernel" "kernel32" } }
-[ first2 add-simple-library ] each
+{
+    { "user" "user32" }
+    { "kernel" "kernel32" }
+} [ first2 add-simple-library ] each
 
-{ "utils" "types" "kernel32" "user32" }
-[ "contrib/win32/" swap ".factor" append3 run-file ] each
-
-"win32" words [ try-compile ] each
+{ 
+    "utils"
+    "types"
+    "kernel32"
+    "user32"
+} [ "contrib/win32/" swap ".factor" append3 run-file ] each
diff --git a/contrib/x11/load.factor b/contrib/x11/load.factor
index c82ae1f99f..953a8412e4 100644
--- a/contrib/x11/load.factor
+++ b/contrib/x11/load.factor
@@ -1,5 +1,5 @@
 IN: scratchpad
-USING: kernel parser words compiler sequences ;
+USING: alien compiler kernel parser sequences words ;
 
 "X11" "libX11" add-simple-library
 
@@ -13,4 +13,4 @@ USING: kernel parser words compiler sequences ;
     "gl"    
 } [ "contrib/x11/" swap ".factor" append3 run-file ] each
 
-{ "xlib" "x11" } [ words [ try-compile ] each ] each
+! { "xlib" "x11" } [ words [ try-compile ] each ] each
diff --git a/debian/changelog b/debian/changelog
index 53f2164f4b..2bcac75095 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+factor (0.79+cvs20060120-1) unstable; urgency=low
+
+  * Refactored wrapper scripts and reduced build time.
+
+ -- Trent Buck <trentbuck@gmail.com>  Fri, 20 Jan 2006 12:18:21 +1100
+
 factor (0.79+cvs20060119-1) unstable; urgency=low
 
   * Make an extended.image.
diff --git a/debian/rules b/debian/rules
index a485e658ee..ab4ab5f649 100644
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ build-stamp: configure-stamp
 	# Build the extended image
 	sqlite3 contrib/sqlite/test.db < contrib/sqlite/test.txt
 	$(CC) $(CFLAGS) -L /usr/X11R6/lib -shared -o contrib/factory/simple-error-handler.so contrib/factory/simple-error-handler.c -lX11
-	echo 'USING: image kernel ; "extended.image" save-image 0 exit' | ./runtime basic.image contrib/load.factor
+	echo 'USING: image kernel ; "contrib/load.factor" run-file compile-all "extended.image" save-image 0 exit' | ./runtime basic.image +X8
 	# Build the documentation
 	cd doc && for i in *.eps; do epstopdf $$i; done
 	cd doc && rubber --pdf theory
@@ -49,11 +49,15 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 	# Install binary files
-	install runtime boot.image basic.image extended.image $(CURDIR)/debian/factor/usr/lib/factor
+	install -m 755 -o root -g root runtime $(CURDIR)/debian/factor/usr/lib/factor
+	install -m 644 -o root -g root boot.image basic.image extended.image $(CURDIR)/debian/factor/usr/lib/factor
 	# Install source files
-	install contrib examples fonts library version.factor $(CURDIR)/debian/factor/usr/share/factor
+	cp -r contrib examples fonts library version.factor $(CURDIR)/debian/factor/usr/share/factor
+	find $(CURDIR)/debian/factor/usr/share/factor -type d -exec chmod 755 {} \;
+	find $(CURDIR)/debian/factor/usr/share/factor -type f -exec chmod 644 {} \;
+	chown -R root.root $(CURDIR)/debian/factor/usr/share/factor
 	# Install wrapper scripts
-	install -m 755 debian/scripts/factor-* $(CURDIR)/debian/factor/usr/bin
+	install -m 755 -o root -g root debian/scripts/factor-* $(CURDIR)/debian/factor/usr/bin
 
 binary-indep: build install