diff --git a/internal/rosa/kernel.go b/internal/rosa/kernel.go
index a61b85e..96e3bff 100644
--- a/internal/rosa/kernel.go
+++ b/internal/rosa/kernel.go
@@ -23,7 +23,7 @@ export LLVM=1
 export HOSTLDFLAGS="${LDFLAGS}"
 cd /usr/src/linux
 `+script, pkg.Path(AbsUsrSrc.Append("linux"), true, t.NewPatchedSource(
-		"kernel", pkg.NewHTTPGetTar(
+		"kernel", version, pkg.NewHTTPGetTar(
 			nil,
 			"https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/"+
 				"snapshot/linux-"+version+".tar.gz",
diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go
index 6e413bd..59d8046 100644
--- a/internal/rosa/llvm.go
+++ b/internal/rosa/llvm.go
@@ -171,7 +171,7 @@ cp -r /system/include /usr/include && rm -rf /system/include
 	}
 
 	return t.NewViaCMake("llvm", version, variant, t.NewPatchedSource(
-		"llvmorg", pkg.NewHTTPGetTar(
+		"llvmorg", version, pkg.NewHTTPGetTar(
 			nil, "https://github.com/llvm/llvm-project/archive/refs/tags/"+
 				"llvmorg-"+version+".tar.gz",
 			mustDecode(checksum),
diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go
index 312e16b..df1ed9f 100644
--- a/internal/rosa/rosa.go
+++ b/internal/rosa/rosa.go
@@ -275,7 +275,7 @@ ln -vs ../usr/bin /work/bin
 // NewPatchedSource returns [pkg.Artifact] of source with patches applied. If
 // passthrough is true, source is returned as is for zero length patches.
 func (t Toolchain) NewPatchedSource(
-	name string,
+	name, version string,
 	source pkg.Artifact,
 	passthrough bool,
 	patches ...[2]string,
@@ -293,13 +293,18 @@ func (t Toolchain) NewPatchedSource(
 	}
 	paths[0] = pkg.Path(AbsUsrSrc.Append(name), false, source)
 
-	aname := name + "-src"
+	aname := name + "-" + version + "-src"
 	script := `
 cp -r /usr/src/` + name + `/. /work/.
 chmod -R +w /work && cd /work
 `
 	if len(paths) > 1 {
-		script += `cat /usr/src/` + name + `-patches/* | patch -p 1`
+		script += `
+cat /usr/src/` + name + `-patches/* | \
+	patch \
+	-p 1 \
+	--ignore-whitespace
+`
 		aname += "-patched"
 	}
 	return t.New(aname, stage3Concat(t, []pkg.Artifact{},