diff --git a/Makefile b/Makefile
index 614d28b..9b86d3e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ BIN_BASE = \
 	bin/basestrap \
 	bin/manjaro-chroot \
 	bin/fstabgen \
+	bin/signfile \
 	bin/chroot-run
 
 LIBS_BASE = \
@@ -35,7 +36,6 @@ BIN_PKG = \
 	bin/lddd \
 	bin/finddeps \
 	bin/find-libdeps \
-	bin/signpkg \
 	bin/signpkgs \
 	bin/mkchrootpkg \
 	bin/buildpkg \
@@ -61,8 +61,7 @@ SETS_ISO = \
 BIN_ISO = \
 	bin/buildiso \
 	bin/testiso \
-	bin/deployiso \
-	bin/signiso
+	bin/deployiso
 
 LIBS_ISO = \
 	lib/util-iso.sh \
diff --git a/bin/signiso.in b/bin/signfile.in
similarity index 89%
rename from bin/signiso.in
rename to bin/signfile.in
index b92fef2..f4fdb6e 100644
--- a/bin/signiso.in
+++ b/bin/signfile.in
@@ -21,9 +21,9 @@ load_vars "$HOME/.makepkg.conf"
 load_vars /etc/makepkg.conf
 
 if [ ! -e "$1" ]; then
-	error "Iso %s does not exist!" "$1"
+	error "%s does not exist!" "$1"
 	exit 1
 fi
 
-msg "Signing iso %s with key %s" "$1" "${GPGKEY}..."
+msg "Signing %s with key %s" "$1" "${GPGKEY}..."
 gpg --detach-sign --use-agent -u "${GPGKEY}" "$1"
diff --git a/bin/signpkg.in b/bin/signpkg.in
deleted file mode 100644
index fb081cc..0000000
--- a/bin/signpkg.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-version=@version@
-
-LIBDIR='@libdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-
-import ${LIBDIR}/util.sh
-
-load_vars "$HOME/.makepkg.conf"
-load_vars /etc/makepkg.conf
-
-if [ ! -e "$1" ]; then
-	error "Package '$1' does not exists!"
-	exit 1
-fi
-
-msg "Signing package %s with key %s" "$1" "${GPGKEY}..."
-gpg --detach-sign --use-agent -u "${GPGKEY}" "$1"
diff --git a/bin/signpkgs.in b/bin/signpkgs.in
index 736003a..56476e7 100644
--- a/bin/signpkgs.in
+++ b/bin/signpkgs.in
@@ -11,4 +11,4 @@
 
 version=@version@
 
-find $PWD -maxdepth 1 -name '*.pkg.tar.xz' -exec signpkg {} \;
+find $PWD -maxdepth 1 -name '*.pkg.tar.xz' -exec signfile {} \;
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 446a3bc..45d82a7 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -589,7 +589,7 @@ load_profile(){
 }
 
 sign_iso(){
-	su ${OWNER} -c "signiso ${iso_dir}/$1"
+	su ${OWNER} -c "signfile ${iso_dir}/$1"
 }
 
 compress_images(){
diff --git a/lib/util-pkg.sh b/lib/util-pkg.sh
index cc85261..0a9e57e 100644
--- a/lib/util-pkg.sh
+++ b/lib/util-pkg.sh
@@ -105,7 +105,7 @@ clean_up(){
 }
 
 sign_pkg(){
-	su ${OWNER} -c "signpkg ${pkg_dir}/$1"
+	su ${OWNER} -c "signfile ${pkg_dir}/$1"
 }
 
 run_post_build(){