diff --git a/build-moogli b/build-moogli
new file mode 100755
index 0000000000000000000000000000000000000000..6a5f31733e6e3bcd5565b3371077fa159d93d711
--- /dev/null
+++ b/build-moogli
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+(cd moogli; make build)
+local_site_package_directory=`python -c "import site; print site.getusersitepackages()"`
+mkdir -p "$local_site_package_directory"
+echo "`pwd`/moogli" > "$local_site_package_directory/moogli.pth"
diff --git a/build-moose b/build-moose
new file mode 100755
index 0000000000000000000000000000000000000000..4b8b083d712fd700cd6991d40426c76d5cdf0cd1
--- /dev/null
+++ b/build-moose
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+sh ./build-moose-core
+sh ./build-moogli
diff --git a/build-moose-core b/build-moose-core
new file mode 100755
index 0000000000000000000000000000000000000000..e97b1d28500493fff7c74e57c2dc6b0dbc19ff99
--- /dev/null
+++ b/build-moose-core
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+(cd moose-core; make USE_SBML=1)
+local_site_package_directory=`python -c "import site; print site.getusersitepackages()"`
+mkdir -p "$local_site_package_directory"
+echo "`pwd`/moose-core/python" > "$local_site_package_directory/moose.pth"
+
diff --git a/moogli b/moogli
index 9681522f43bbc0dde26f282138e93e5b5b85aa81..317b31d00415cc933560531a34ae6673d9ecaab2 160000
--- a/moogli
+++ b/moogli
@@ -1 +1 @@
-Subproject commit 9681522f43bbc0dde26f282138e93e5b5b85aa81
+Subproject commit 317b31d00415cc933560531a34ae6673d9ecaab2
diff --git a/moose-core b/moose-core
index af822336e42d4e933f50f664beccadc7a17f058e..1d6208f2a5cbe7cc43ac2bfd1edf43c4ee385619 160000
--- a/moose-core
+++ b/moose-core
@@ -1 +1 @@
-Subproject commit af822336e42d4e933f50f664beccadc7a17f058e
+Subproject commit 1d6208f2a5cbe7cc43ac2bfd1edf43c4ee385619
diff --git a/update-repository b/update-repository
index 8d1aa9528e7c0dc4f24a80833ae4371fbace1bad..3447029a891fb03b0c8c9c2d6e9d0f8530632e63 100755
--- a/update-repository
+++ b/update-repository
@@ -3,4 +3,4 @@
 # This script updates the repository and its subrepositories, recursively.
 
 git submodule update --init
-git submodule foreach '[ "$path" = "moogli" ] && branch=geometry || branch=master; git pull origin $branch; git checkout $branch' 
+git submodule foreach '[ "$path" = "moogli" ] && branch=geometry || branch=master; git pull origin $branch; git checkout $branch; git pull'