diff --git a/srcpkgs/sbsigntool/patches/sbsign_check_write_return.patch b/srcpkgs/sbsigntool/patches/sbsign_check_write_return.patch
index efe9a06b6c..e9a4e40683 100644
--- a/srcpkgs/sbsigntool/patches/sbsign_check_write_return.patch
+++ b/srcpkgs/sbsigntool/patches/sbsign_check_write_return.patch
@@ -18,35 +18,3 @@ Index: sbsigntool/src/sbsign.c
 +	return (rc == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
  }
  
-Index: sbsigntool/src/fileio.c
-===================================================================
---- sbsigntool.orig/src/fileio.c
-+++ sbsigntool/src/fileio.c
-@@ -201,12 +201,12 @@ int fileio_write_file(const char *filena
- 
- 	fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
- 	if (fd < 0) {
--		perror("open");
-+		perror("fileio_write_file/open");
- 		return -1;
- 	}
- 
- 	if (!write_all(fd, buf, len)) {
--		perror("write_all");
-+		perror("fileio_write_file/write_all");
- 		close(fd);
- 		return -1;
- 	}
-Index: sbsigntool/src/image.c
-===================================================================
---- sbsigntool.orig/src/image.c
-+++ sbsigntool/src/image.c
-@@ -658,7 +658,7 @@ int image_write(struct image *image, con
- 
- 	fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
- 	if (fd < 0) {
--		perror("open");
-+		perror("image_write/open");
- 		return -1;
- 	}
- 
diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 45d41431ae..30f78e1168 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,24 +1,34 @@
 # Template file for 'sbsigntool'
 pkgname=sbsigntool
-version=0.9.2
-revision=2
+version=0.9.3
+revision=1
 archs="x86_64* i686* aarch64* arm*"
+wrksrc=sbsigntools-$version
 build_style=gnu-configure
-hostmakedepends="autoconf automake pkg-config"
+hostmakedepends="autoconf automake pkg-config help2man"
 makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
 short_desc="Signing utility for UEFI secure boot"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/"
-distfiles="${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-checksum=1dc1e1de5f2dda50dbd2e6a83355fe7ae38ca0f79daeb404026421af70606653
+# sbsigntool depends on ccan, pull it from old release
+# Pull from https://git.ozlabs.org/?p=ccan;a=snapshot;h=b1f28e17;sf=tgz
+# is OK if you'd like to resolve cross-compile issues.
+# I don't want to waste time on that.
+distfiles="$homepage/snapshot/sbsigntools-$version.tar.gz
+ $DEBIAN_SITE/main/s/sbsigntool/sbsigntool_0.9.2.orig.tar.gz"
+checksum="02ff79f84b27c8ed70ecade1b1741e5ae50ac23192672a744eef0e3549cc72e7
+ 1dc1e1de5f2dda50dbd2e6a83355fe7ae38ca0f79daeb404026421af70606653"
 patch_args="-Np1"
+skip_extraction="sbsigntool_0.9.2.orig.tar.gz"
+conf_files="/etc/default/sbsigntool-kernel-hook"
 
-if [ ! "$CROSS_BUILD" ]; then
-	hostmakedepends+=" help2man"
-fi
+post_extract() {
+	bsdtar -xzf $XBPS_SRCDISTDIR/$pkgname-$version/sbsigntool_0.9.2.orig.tar.gz
+	mv sbsigntool-0.9.2/lib/ccan lib
+}
 
-pre_patch() {
+post_patch() {
 	[ ! "$CROSS_BUILD" ] && return
 
 	case "${XBPS_TARGET_MACHINE}" in
@@ -26,15 +36,19 @@ pre_patch() {
 		i686*) _ARCH=ia32 ;;
 		*) _ARCH="${XBPS_TARGET_MACHINE%-musl}" ;;
 	esac
-	sed -i -e "/^EFI_ARCH=/s/=.*/=${_ARCH}/" \
-		-e "s,^\(for path in\).*;,\1 ${XBPS_CROSS_BASE}/usr/lib ;," \
+	vsed -i -e "/^EFI_ARCH=/s/=.*/=${_ARCH}/" \
+		-e "/^for path in .*lib/s,in ,in ${XBPS_CROSS_BASE}/usr/lib ," \
 		-e "/^EFI_CPPFLAGS=/s,I\(/usr/include\),I${XBPS_CROSS_BASE}\1,g" \
 		configure.ac
-	sed -i -e "/^man/s/=.*/=/" docs/Makefile.am
+	vsed -i -e "/^man/s/=.*/=/" docs/Makefile.am
 }
 
 pre_configure() {
-	autoreconf -i
+	touch AUTHORS ChangeLog
+	aclocal
+	autoheader
+	autoconf
+	automake --add-missing -Wno-portability
 }
 
 post_install() {