diff --git a/patches/wscript_build b/patches/wscript_build
deleted file mode 100644
index 5abef720b8a..00000000000
--- a/patches/wscript_build
+++ /dev/null
@@ -1,15 +0,0 @@
-import os, Utils, glob, re
-
-bld.substitute("*/**",name="patchsubst")
-
-for virttech in Utils.to_list(bld.path.ant_glob("*",dir=True)):
-	if virttech in ["shared","wscript_build"]: continue
-	patchfiles = bld.path.ant_glob('shared/** %s/debian/config/**'%virttech,src=False,bld=True,dir=False,flat=True)
-	tgen = bld(
-		features  = 'tar',#Utils.tar_up,
-		source = patchfiles,
-		target = 'cloud-scripts.tgz',
-		name   = 'cloud-scripts_tgz',
-		root = os.path.join("patches", virttech + "/debian/config"),
-		rename = lambda x: re.sub(".subst$","",x),
-	)
diff --git a/wscript_build b/wscript_build
index 969ae1cfd51..c7080eb2613 100644
--- a/wscript_build
+++ b/wscript_build
@@ -131,8 +131,24 @@ if not Options.options.PRESERVECONFIG: bld.install_files_filtered("${CPSYSCONFDI
 # ================ Creation of patch.tgz's ============================
 
 # done here because the patches require substituted files
-bld.recurse(["patches"],'build')
+start_path = bld.path.find_dir ("patches")
+bld.substitute("*/**",name="patchsubst", cwd = start_path)
 
+for virttech in Utils.to_list(start_path.ant_glob("*",dir=True)):
+	if virttech in ["shared"]: continue
+	patchfiles = start_path.ant_glob('shared/** %s/debian/config/**'%virttech,src=False,bld=True,dir=False,flat=True)
+
+	tmp = bld.path
+	bld.path = start_path
+	tgen = bld(
+		features  = 'tar',#Utils.tar_up,
+		source = patchfiles,
+		target = 'cloud-scripts.tgz',
+		name   = 'cloud-scripts_tgz',
+		root = os.path.join("patches", virttech + "/debian/config"),
+		rename = lambda x: re.sub(".subst$","",x),
+	)
+	bld.path = tmp
 # ================== End creation of patch.tgz's ====================