diff --git a/etc/update.vars b/etc/update.vars
index 5eeac2f1b36c15d83538a71fd1474fc3e960b637..4c3aa5f3548ebeb1b3aa3c9fd45341c9d2a64eb8 100644
--- a/etc/update.vars
+++ b/etc/update.vars
@@ -1,3 +1,10 @@
 MTNURL=127.0.0.1:8998
 MTNBRANCH=i2p.www
 TOUCHFILE=/tmp/2fcd2f17-c293-4f77-b4c9-9b266ba70daa
+TIMEOUT="20m"
+
+if [ $(which timeout) ]; then
+    MTN="timeout $TIMEOUT mtn"
+else
+    MTN="mtn"
+fi
diff --git a/site-updater.sh b/site-updater.sh
index 73f77c67293d16ca01f072731b7cba21315f7c5a..02a644f78d5c7e78ea677a313a58f0161139117a 100755
--- a/site-updater.sh
+++ b/site-updater.sh
@@ -1,11 +1,12 @@
-#!/bin/sh
+#!/bin/sh -x
+cd $(dirname $0)
 . ./etc/update.vars
 
 TMP=$(mktemp XXXXXXXXXX)
 trap 'rm -f $TMP;exit' 0 1 2 15
 
-mtn pull "mtn://$MTNURL?$MTNBRANCH"
-mtn up 2>&1 | tee $TMP
+$MTN pull "mtn://$MTNURL?$MTNBRANCH"
+$MTN up 2>&1 | tee $TMP
 
 
 if grep "^mtn: \(add\|patch\|dropp\|updat\)\(ed\|ing\) 'i2p2www/translations/" "$TMP" >/dev/null ; then