diff --git a/patches/wscript_build b/patches/wscript_build
index 7cca9b09902..cc007c5c2ab 100644
--- a/patches/wscript_build
+++ b/patches/wscript_build
@@ -18,12 +18,3 @@ for virttech in Utils.to_list(bld.path.ant_glob("*",dir=True)):
 	if virttech != "xenserver":
 		# xenserver uses the patch.tgz file later to make an ISO, so we do not need to install it
 		bld.install_as("${AGENTLIBDIR}/scripts/vm/hypervisor/%s/patch.tgz"%virttech, "%s-patch.tgz"%virttech)
-
-tgen = bld(
-	rule = 'cp ${SRC} ${TGT}',
-	source = 'xenserver-patch.tgz',
-	target = 'patch.tgz',
-	after = 'xenserver-patch_tgz',
-	name = 'patch_tgz'
-)
-bld.process_after(tgen)
diff --git a/wscript_build b/wscript_build
index a22455d8ffa..1c81300dff1 100644
--- a/wscript_build
+++ b/wscript_build
@@ -289,11 +289,11 @@ if bld.env.DISTRO not in ["Windows","Mac"]:
 	# systemvm.zip cannot be built on Windows or Mac because system deps do not exist there
 	tgen = bld(
 		rule = iso_up,
-		source = "patches/patch.tgz target/oss/systemvm.zip",
+		source = "patches/xenserver-patch.tgz target/oss/systemvm.zip",
 		target = 'target/oss/systemvm.iso',
 		name   = 'systemvm_iso',
-		after  = 'systemvm_zip patch_tgz',
-		rename = lambda x: x.split(sep)[-1],
+		after  = 'systemvm_zip xenserver-patch_tgz',
+		rename = lambda x: x.split(sep)[-1].replace('xenserver-',''),
 	)
 	bld.process_after(tgen)
 	bld.install_as("${AGENTLIBDIR}/vms/systemvm.iso", "target/oss/systemvm.iso")
@@ -301,11 +301,11 @@ if bld.env.DISTRO not in ["Windows","Mac"]:
 if buildpremium:
 	tgen = bld(
 		rule = iso_up,
-		source = "patches/patch.tgz target/premium/systemvm.zip",
+		source = "patches/xenserver-patch.tgz target/premium/systemvm.zip",
 		target = 'target/premium/systemvm.iso',
 		name   = 'systemvm-premium_iso',
-		after  = 'systemvm-premium_zip patch_tgz',
-		rename = lambda x: x.split(sep)[-1],
+		after  = 'systemvm-premium_zip xenserver-patch_tgz',
+		rename = lambda x: x.split(sep)[-1].replace('xenserver-',''),
 	)
 	bld.process_after(tgen)
 	bld.install_as("${AGENTLIBDIR}/vms/systemvm-premium.iso", "target/premium/systemvm.iso")