diff --git a/02-sahana.sh b/02-sahana.sh
index b2742b4..c7239aa 100644
--- a/02-sahana.sh
+++ b/02-sahana.sh
@@ -6,10 +6,10 @@ SOURCE_DIR=$(realpath $(dirname "${0}"))
 apt-get -y --no-install-recommends install python-dateutil python-imaging python-lxml python-matplotlib python-psycopg2 python-reportlab python-requests python-shapely python-xlrd python-xlwt
 
 # Install web2py
-wget http://web2py.com/examples/static/web2py_src.zip -O /srv/web2py.zip
-unzip -d /srv /srv/web2py.zip
-mv /srv/web2py /srv/sahana
-rm -f /srv/web2py.zip
+git clone --recursive https://github.com/web2py/web2py.git /srv/sahana
+git -C /srv/sahana checkout tags/latest
+git -C /srv/sahana submodule update
+rm -rf /srv/sahana/.git* /srv/sahana/gluon/packages/dal/.git*
 
 # Install Sahana
 wget https://github.com/sahana/eden/archive/master.tar.gz -O /srv/sahana/applications/eden.tgz