diff --git a/scripts/libmakepkg/integrity/generate_signature.sh.in b/scripts/libmakepkg/integrity/generate_signature.sh.in
index 442fe031..261b18f7 100644
--- a/scripts/libmakepkg/integrity/generate_signature.sh.in
+++ b/scripts/libmakepkg/integrity/generate_signature.sh.in
@@ -50,25 +50,12 @@ create_package_signatures() {
 	if [[ $SIGNPKG != 'y' ]]; then
 		return 0
 	fi
-	local pkg pkgarch pkg_file
-	local fullver=$(get_full_version)
 
 	msg "$(gettext "Signing package(s)...")"
 
-	for pkg in "${pkgname[@]}"; do
-		pkgarch=$(get_pkg_arch $pkg)
-		pkg_file="$PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT}"
-
-		create_signature "$pkg_file"
-	done
-
-	# check if debug package needs a signature
-	if ! check_option "debug" "y" || ! check_option "strip" "y"; then
-		pkg=$pkgbase-@DEBUGSUFFIX@
-		pkgarch=$(get_pkg_arch)
-		pkg_file="$PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT}"
+	print_all_package_names | while read -r pkg_file; do
 		if [[ -f $pkg_file ]]; then
 			create_signature "$pkg_file"
 		fi
-	fi
+	done
 }