diff --git a/Makefile b/Makefile
index 9a62bdd4..011f3a9e 100755
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 
 package=davical
 version=$(shell cat VERSION)
+snapshot : version = $(shell sed -n 's:\([0-9\.]*\)[-a-f0-9-]*:\1:p' VERSION)-git$(shell git rev-parse --short HEAD)
 
 all: htdocs/always.php built-docs built-po
 
@@ -31,6 +32,8 @@ release: built-docs VERSION
 	    $(shell find $(package)-$(version)/docs/api/ ! -name "phpdoc.ini" )
 	rm $(package)-$(version)
 
+snapshot: release
+
 clean:
 	rm -f built-docs built-po
 	-find . -name "*~" -delete
diff --git a/scripts/build-always.sh b/scripts/build-always.sh
index bdc35326..926ad2dd 100755
--- a/scripts/build-always.sh
+++ b/scripts/build-always.sh
@@ -7,7 +7,7 @@ DAVICAL_VERSION="`head -n1 VERSION`"
 DB_VERSION="`grep 'SELECT new_db_revision' dba/davical.sql | cut -f2 -d'(' | cut -f1-3 -d,`"
 AWL_VERSION="`head -n1 ../awl/VERSION`"
 if [ -z "${AWL_VERSION}" ] ; then
-  AWL_VERSION="`grep 'want_awl_version' htdocs/always.php | cut -f2 -d= | cut -f1 -d';'`"  
+  AWL_VERSION="'`grep 'want_awl_version' inc/always.php.in | cut -f2 -d= | cut -f1 -d';' | sed 's: ::g'`'"  
 fi
 
 sed -e "/^ *.c->version_string *= *'[^']*' *;/ s/^ *.c->version_string *= *'[^']*' *;/\$c->version_string = '${DAVICAL_VERSION}';/" \