diff --git a/Makefile b/Makefile
index e63a51329e..b3796e2438 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/08/08]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/08/15]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos
@@ -2505,7 +2505,7 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-.PHONY: lcl components packager/registration ideintf packager ide idepkg tools all clean cleanide
+.PHONY: lcl components packager/registration ideintf packager ide idepkg tools all clean cleanide purge
 .SUFFIXES: .rc .res
 %.res: %.rc
 	windres -i $< -o $@ --preprocessor $(RCPP)
@@ -2536,3 +2536,6 @@ ifeq ($(OS_TARGET), win32)
 	$(DEL) lazarus.owr
 endif
 clean: cleanall cleanide
+purge: cleanall cleanide
+	$(MAKE) -C examples clean
+	$(MAKE) -C tools clean
diff --git a/Makefile.fpc b/Makefile.fpc
index 7348b64517..f73c92b338 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -65,7 +65,7 @@ export LAZARUS_CONFIG_DIR
 LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
 
 [rules]
-.PHONY: lcl components packager/registration ideintf packager ide idepkg tools all clean cleanide
+.PHONY: lcl components packager/registration ideintf packager ide idepkg tools all clean cleanide purge
 .SUFFIXES: .rc .res
 
 %.res: %.rc
@@ -104,6 +104,10 @@ endif
 
 clean: cleanall cleanide
 
+purge: cleanall cleanide
+        $(MAKE) -C examples clean
+        $(MAKE) -C tools clean
+
 #install: $(INSTALLTARGET) $(addsuffix _install,$(TARGET_DIRS))
 # end.
 
diff --git a/tools/install/create_lazarus_tgz_from_local_dir.sh b/tools/install/create_lazarus_tgz_from_local_dir.sh
index 66fc07853e..6ff86bd311 100644
--- a/tools/install/create_lazarus_tgz_from_local_dir.sh
+++ b/tools/install/create_lazarus_tgz_from_local_dir.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -x
 set -e
 
 LazSrcDir=$1
-OutFile=lazarus-0.8.5-1.tgz
+OutFile=lazarus-0.9.1-5.tgz
 
 if [ "x$LazSrcDir" = "x" ]; then
   echo "Usage: $0 <lazarus_source_directory>"
@@ -21,15 +21,7 @@ rm -rf /tmp/lazarus
 cd -
 cp -a $LazSrcDir /tmp/lazarus
 
-echo "cleaning up (CVS, ppu, o) ..."
-cd /tmp/lazarus
-make cleanall
-for Ext in ppu ppw ppl o ow rst cvsignore bak; do
-  find . -name "*.$Ext" -exec rm -f {} \;
-done
-find . -name "*.~*" -exec rm -f {} \;
-rm -rf tools/install/*.tgz
-cd -
+sh clean_lazaru_directory.sh $LazSrcDir
 
 # pack
 echo "packing ..."