diff --git a/s/build b/s/build
index 709c92510..e54f83ace 100755
--- a/s/build
+++ b/s/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 ROOT=$(git rev-parse --show-toplevel)
-
+eval $(luarocks path)
 [ -z "$BUILD" ] && BUILD=Debug
 if [ -z "$JOBS" ] ; then
   if [ -e /usr/sbin/sysctl ]; then
diff --git a/s/cmake-init b/s/cmake-init
index a8228c379..00e6d3d06 100755
--- a/s/cmake-init
+++ b/s/cmake-init
@@ -6,6 +6,7 @@ pkg-config --exists sqlite3 && ERESSEA_DB=sqlite
 GETOPT=getopt
 GETOPT_LONG=1
 
+luarocks install lunitx --local
 if [ "Darwin" = "$(uname)" ] ; then
   if [ -x "/usr/local/opt/gnu-getopt/bin/getopt" ] ; then
     GETOPT="/usr/local/opt/gnu-getopt/bin/getopt"
@@ -74,8 +75,6 @@ fi
 
 DEST=$(dirname $ROOT)/server
 
-git submodule update --init
-
 LUA_VERSION="5.2"
 LUA_INCLUDE=/usr/include
 LUA_DIR=/usr