diff --git a/shutils/patch_funcs.sh b/shutils/patch_funcs.sh
index d10b32bc18..2ea317ce09 100644
--- a/shutils/patch_funcs.sh
+++ b/shutils/patch_funcs.sh
@@ -32,11 +32,11 @@ apply_tmpl_patches()
 	local i=
 
 	# Apply some build/install patches automatically.
-	if [ -f $XBPS_TEMPLATESDIR/$pkgname/$pkgname-fix-build.diff ]; then
-		patch_files="$pkgname-fix-build.diff $patch_files"
+	if [ -f $XBPS_TEMPLATESDIR/$pkgname/build.diff ]; then
+		patch_files="build.diff $patch_files"
 	fi
-	if [ -f $XBPS_TEMPLATESDIR/$pkgname/$pkgname-fix-install.diff ]; then
-		patch_files="$pkgname-fix-install.diff $patch_files"
+	if [ -f $XBPS_TEMPLATESDIR/$pkgname/install.diff ]; then
+		patch_files="install.diff $patch_files"
 	fi
 
 	[ -z "$patch_args" ] && patch_args="-p0"
diff --git a/templates/bzip2/bzip2-fix-install.diff b/templates/bzip2/install.diff
similarity index 100%
rename from templates/bzip2/bzip2-fix-install.diff
rename to templates/bzip2/install.diff
diff --git a/templates/cpio/cpio-fix-build.diff b/templates/cpio/build.diff
similarity index 100%
rename from templates/cpio/cpio-fix-build.diff
rename to templates/cpio/build.diff
diff --git a/templates/gdbm/gdbm-fix-install.diff b/templates/gdbm/install.diff
similarity index 100%
rename from templates/gdbm/gdbm-fix-install.diff
rename to templates/gdbm/install.diff
diff --git a/templates/gzip/gzip-fix-build.diff b/templates/gzip/build.diff
similarity index 100%
rename from templates/gzip/gzip-fix-build.diff
rename to templates/gzip/build.diff
diff --git a/templates/kbd/kbd-fix-build.diff b/templates/kbd/build.diff
similarity index 100%
rename from templates/kbd/kbd-fix-build.diff
rename to templates/kbd/build.diff
diff --git a/templates/mono/mono-fix-build.diff b/templates/mono/build.diff
similarity index 100%
rename from templates/mono/mono-fix-build.diff
rename to templates/mono/build.diff
diff --git a/templates/openssl/openssl-fix-build.diff b/templates/openssl/build.diff
similarity index 100%
rename from templates/openssl/openssl-fix-build.diff
rename to templates/openssl/build.diff
diff --git a/templates/openssl/openssl-fix-install.diff b/templates/openssl/install.diff
similarity index 100%
rename from templates/openssl/openssl-fix-install.diff
rename to templates/openssl/install.diff
diff --git a/templates/procps/procps-fix-install.diff b/templates/procps/install.diff
similarity index 100%
rename from templates/procps/procps-fix-install.diff
rename to templates/procps/install.diff
diff --git a/templates/sysklogd/sysklogd-fix-install.diff b/templates/sysklogd/install.diff
similarity index 100%
rename from templates/sysklogd/sysklogd-fix-install.diff
rename to templates/sysklogd/install.diff
diff --git a/templates/tzdata/tzdata-fix-build.diff b/templates/tzdata/build.diff
similarity index 100%
rename from templates/tzdata/tzdata-fix-build.diff
rename to templates/tzdata/build.diff
diff --git a/templates/util-linux/util-linux-fix-build.diff b/templates/util-linux/build.diff
similarity index 100%
rename from templates/util-linux/util-linux-fix-build.diff
rename to templates/util-linux/build.diff
diff --git a/templates/zlib/zlib-fix-build.diff b/templates/zlib/build.diff
similarity index 100%
rename from templates/zlib/zlib-fix-build.diff
rename to templates/zlib/build.diff