diff --git a/.gitignore b/.gitignore
index 7ae5a648..8e2e669a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 *.pyc
 *.mo
 *.gmo
+waflib
diff --git a/unpack_waf.sh b/unpack_waf.sh
index 257fab4f..b11f0c0c 100755
--- a/unpack_waf.sh
+++ b/unpack_waf.sh
@@ -22,10 +22,10 @@ set -e
 
 echo -n "Unpacking waf... "
 ./waf --help &>/dev/null
-WAFDIR=`ls .waf-*/`
-mv .waf-*/${WAFDIR} ${WAFDIR}
+WAFDIR=`ls .waf*/`
+mv .waf*/${WAFDIR} ${WAFDIR}
 sed -i '/^#==>$/,$d' waf
-rmdir .waf-*
+rmdir .waf*
 echo "OK."
 
 echo -n "Purging .pyc files... "