diff --git a/Tuprules.tup b/Tuprules.tup
index 54585635d..811523efc 100644
--- a/Tuprules.tup
+++ b/Tuprules.tup
@@ -36,14 +36,31 @@ ERRATA_DIR = $(TUP_CWD)/errata
 
 !raw_to_depot = |> ^ raw/%d/%b^ cp -r %f %o |> $(DEPOT_RAW_DIR)/%d/@(DEPOT_VERSION)/%b
 
-ifdef DEPOT_KEY
+ifndef DEPOT_KEY
 
-!depot_bin_tarball = |> ^o archive %d binary^ tar cfJ %o -C $(DEPOT_BIN_DIR)/%d . |> $(PUBLIC_BIN_DIR)/%d/@(DEPOT_VERSION).tar.xz
+!publish_bin = |> |>
+!publish_raw = |> |>
+!publish_pkg = |> |>
 
-!depot_pkg_tarball = |> ^o archive %d package^ tar cfJ %o -C $(DEPOT_PKG_DIR)/%d . |> $(PUBLIC_PKG_DIR)/%d/@(DEPOT_VERSION).tar.xz
+else
 
-!depot_raw_tarball = |> ^o archive %d raw^ tar cfJ %o -C $(DEPOT_RAW_DIR)/%d . |> $(PUBLIC_RAW_DIR)/%d/@(DEPOT_VERSION).tar.xz
+SIGN_CMD = gpg --detach-sign --digest-algo SHA256 --no-tty --local-user @(DEPOT_KEY)
 
-!public_signature = |> ^ sign %b^ gpg --detach-sign --digest-algo SHA256 --no-tty --local-user @(DEPOT_KEY) - < %f > %o |> %f.sig
+!publish_bin = |> ^o publish %d binary^ \
+	tar cfJ %o -C $(DEPOT_BIN_DIR)/%d . ; $(SIGN_CMD) < %o > %o.sig \
+|> $(PUBLIC_BIN_DIR)/%d/@(DEPOT_VERSION).tar.xz \
+|  $(PUBLIC_BIN_DIR)/%d/@(DEPOT_VERSION).tar.xz.sig
+
+!publish_raw = |> ^o publish %d raw^ \
+	tar cfJ %o -C $(DEPOT_RAW_DIR)/%d . ; $(SIGN_CMD) < %o > %o.sig \
+|> $(PUBLIC_RAW_DIR)/%d/@(DEPOT_VERSION).tar.xz \
+|  $(PUBLIC_RAW_DIR)/%d/@(DEPOT_VERSION).tar.xz.sig
+
+!publish_pkg = |> ^o publish %d package^ \
+	tar cfJ %o -C $(DEPOT_PKG_DIR)/%d . ; $(SIGN_CMD) < %o > %o.sig \
+|> $(PUBLIC_PKG_DIR)/%d/@(DEPOT_VERSION).tar.xz \
+|  $(PUBLIC_PKG_DIR)/%d/@(DEPOT_VERSION).tar.xz.sig
+
+!public_signature = |> ^ sign %b^ $(SIGN_CMD) < %f > %o |> %f.sig
 
 endif
diff --git a/lib/libflif/Tupfile b/lib/libflif/Tupfile
index a0c8ab1cc..bffb151d5 100644
--- a/lib/libflif/Tupfile
+++ b/lib/libflif/Tupfile
@@ -41,6 +41,5 @@ LDFLAGS += `pkg-config --libs $(PKG_CONFIGS)`
 : libflif.lib.so |> strip -o %o %f |> $(DEPOT_BIN_DIR)/%d/@(DEPOT_VERSION)/%b {binary}
 
 ifdef DEPOT_KEY
-: {binary}  |> !depot_bin_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
+: {binary}  |> !publish_bin |>
 endif
diff --git a/libretro/cores/2048/Tuprules.tup b/libretro/cores/2048/Tuprules.tup
index 814f9c459..a843c90f8 100644
--- a/libretro/cores/2048/Tuprules.tup
+++ b/libretro/cores/2048/Tuprules.tup
@@ -12,8 +12,5 @@ include upstream/Makefile.common
 : $(TUP_CWD)/archives |> !publish_core_archives |> {package}
 : $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
 
-ifdef DEPOT_KEY
-: {binary}  |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/libretro/cores/4do/Tuprules.tup b/libretro/cores/4do/Tuprules.tup
index f631a0fd3..a0c608ffe 100644
--- a/libretro/cores/4do/Tuprules.tup
+++ b/libretro/cores/4do/Tuprules.tup
@@ -25,8 +25,5 @@ CFLAGS += $(FLAGS)
 : $(TUP_CWD)/archives |> !publish_core_archives |> {package}
 : $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
 
-ifdef DEPOT_KEY
-: {binary} |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/libretro/cores/Tuprules.tup b/libretro/cores/Tuprules.tup
index d13af008b..ca0bb4394 100644
--- a/libretro/cores/Tuprules.tup
+++ b/libretro/cores/Tuprules.tup
@@ -43,17 +43,30 @@ DEPOT_NAME = libretro-$(TARGET_NAME)
 !publish_core_metadata = |> ^ copy %b^ cp %f %o \
 	|> $(DEPOT_PKG_DIR)/$(TARGET_NAME)/@(DEPOT_VERSION)/%b
 
-!core_bin_tarball = |> ^o archive binaries^ \
-	tar cfJ %o -C $(DEPOT_BIN_DIR)/$(DEPOT_NAME) . \
-|> $(PUBLIC_BIN_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz
+ifndef DEPOT_KEY
 
-!core_pkg_tarball = |> ^o archive package metadata^ \
-	tar cfJ %o -C $(DEPOT_PKG_DIR)/$(TARGET_NAME) . \
-|> $(PUBLIC_PKG_DIR)/$(TARGET_NAME)/@(DEPOT_VERSION).tar.xz
+!core_publish_bin = |> |>
+!core_publish_pkg = |> |>
+!core_publish_raw = |> |>
 
-!core_raw_tarball = |> ^o archive raw files^ \
-	tar cfJ %o -C $(DEPOT_RAW_DIR)/$(DEPOT_NAME) . \
-|> $(PUBLIC_RAW_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz
+else
+
+!core_publish_bin = |> ^o archive binaries^ \
+	tar cfJ %o -C $(DEPOT_BIN_DIR)/$(DEPOT_NAME) . ; $(SIGN_CMD) < %o > %o.sig \
+|> $(PUBLIC_BIN_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz \
+|  $(PUBLIC_BIN_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz.sig
+
+!core_publish_pkg = |> ^o archive package metadata^ \
+	tar cfJ %o -C $(DEPOT_PKG_DIR)/$(TARGET_NAME) . ; $(SIGN_CMD) < %o > %o.sig \
+|> $(PUBLIC_PKG_DIR)/$(TARGET_NAME)/@(DEPOT_VERSION).tar.xz \
+|  $(PUBLIC_PKG_DIR)/$(TARGET_NAME)/@(DEPOT_VERSION).tar.xz.sig
+
+!core_publish_raw = |> ^o archive raw files^ \
+	tar cfJ %o -C $(DEPOT_RAW_DIR)/$(DEPOT_NAME) . ; $(SIGN_CMD) < %o > %o.sig \
+|> $(PUBLIC_RAW_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz \
+|  $(PUBLIC_RAW_DIR)/$(DEPOT_NAME)/@(DEPOT_VERSION).tar.xz.sig
+
+endif
 
 LINK_T = $(TUP_CWD)/link.T
 CFLAGS += -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565
diff --git a/libretro/cores/dosbox/Tuprules.tup b/libretro/cores/dosbox/Tuprules.tup
index 64399f25d..a53cf4063 100644
--- a/libretro/cores/dosbox/Tuprules.tup
+++ b/libretro/cores/dosbox/Tuprules.tup
@@ -26,8 +26,5 @@ CXXFLAGS += -DHAVE_MMAP
 : $(TUP_CWD)/archives | {core} |> !publish_core_archives |> {package}
 : $(TUP_CWD)/runtime | {core} |> !publish_core_runtime |> {package}
 
-ifdef DEPOT_KEY
-: {binary}  |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/libretro/cores/fceumm/Tuprules.tup b/libretro/cores/fceumm/Tuprules.tup
index d79e69210..075145522 100644
--- a/libretro/cores/fceumm/Tuprules.tup
+++ b/libretro/cores/fceumm/Tuprules.tup
@@ -21,8 +21,5 @@ CFLAGS += $(INCFLAGS)
 : $(TUP_CWD)/archives |> !publish_core_archives |> {package}
 : $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
 
-ifdef DEPOT_KEY
-: {binary}  |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/libretro/cores/gambatte/Tuprules.tup b/libretro/cores/gambatte/Tuprules.tup
index 537376324..53d6e7c86 100644
--- a/libretro/cores/gambatte/Tuprules.tup
+++ b/libretro/cores/gambatte/Tuprules.tup
@@ -18,8 +18,5 @@ include upstream/Makefile.common
 : $(TUP_CWD)/archives |> !publish_core_archives |> {package}
 : $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
 
-ifdef DEPOT_KEY
-: {binary}  |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/libretro/cores/mgba/Tuprules.tup b/libretro/cores/mgba/Tuprules.tup
index 3379bdc62..c49cbb2f1 100644
--- a/libretro/cores/mgba/Tuprules.tup
+++ b/libretro/cores/mgba/Tuprules.tup
@@ -19,8 +19,5 @@ CFLAGS += $(INCLUDES)
 : $(TUP_CWD)/archives |> !publish_core_archives |> {package}
 : $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
 
-ifdef DEPOT_KEY
-: {binary} |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/libretro/cores/mrboom/Tuprules.tup b/libretro/cores/mrboom/Tuprules.tup
index f0d60557d..d800bdde1 100644
--- a/libretro/cores/mrboom/Tuprules.tup
+++ b/libretro/cores/mrboom/Tuprules.tup
@@ -21,8 +21,5 @@ include upstream/Makefile.common
 : $(TUP_CWD)/archives |> !publish_core_archives |> {package}
 : $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
 
-ifdef DEPOT_KEY
-: {binary}  |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/libretro/cores/nxengine/Tuprules.tup b/libretro/cores/nxengine/Tuprules.tup
index fa0b36e03..2da2dffef 100644
--- a/libretro/cores/nxengine/Tuprules.tup
+++ b/libretro/cores/nxengine/Tuprules.tup
@@ -21,8 +21,5 @@ CXXFLAGS += -fno-rtti -fno-exceptions -std=gnu++11
 : $(TUP_CWD)/archives | {core} |> !publish_core_archives |> {package}
 : $(TUP_CWD)/runtime | {core} |> !publish_core_runtime |> {package}
 
-ifdef DEPOT_KEY
-: {binary}  |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/libretro/cores/oberon/Tuprules.tup b/libretro/cores/oberon/Tuprules.tup
index b42d423ee..3ea5eba01 100644
--- a/libretro/cores/oberon/Tuprules.tup
+++ b/libretro/cores/oberon/Tuprules.tup
@@ -18,9 +18,5 @@ CFLAGS += $(INCFLAGS)
 : $(TUP_CWD)/archives |> !publish_core_archives |> {package}
 : $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
 
-ifdef DEPOT_KEY
-: {binary}  |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: {raw} |> !core_raw_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/libretro/cores/samples/Tuprules.tup b/libretro/cores/samples/Tuprules.tup
index fb266ce74..422b4e4eb 100644
--- a/libretro/cores/samples/Tuprules.tup
+++ b/libretro/cores/samples/Tuprules.tup
@@ -139,8 +139,5 @@ endif
 
 : README.md |> !publish_core_metadata |> {package}
 
-ifdef DEPOT_KEY
-: {binary} |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/libretro/cores/scummvm/Tuprules.tup b/libretro/cores/scummvm/Tuprules.tup
index d2a9af48a..8561b83ce 100644
--- a/libretro/cores/scummvm/Tuprules.tup
+++ b/libretro/cores/scummvm/Tuprules.tup
@@ -27,7 +27,6 @@ include upstream/common/module.mk
 #: $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
 
 ifdef DEPOT_KEY
-: {binary}  |> !depot_bin_tarball |> {tarballs}
-: {package} |> !depot_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
+: {binary}  |> !publish_bin |> {tarballs}
+: {package} |> !publish_pkg |> {tarballs}
 endif
diff --git a/libretro/cores/snes9x/Tuprules.tup b/libretro/cores/snes9x/Tuprules.tup
index ed80937d4..b7b4e5e77 100644
--- a/libretro/cores/snes9x/Tuprules.tup
+++ b/libretro/cores/snes9x/Tuprules.tup
@@ -23,8 +23,5 @@ CXXFLAGS += -DRIGHTSHIFT_IS_SAR -D__LIBRETRO__ -DALLOW_CPU_OVERCLOCK
 : $(TUP_CWD)/archives |> !publish_core_archives |> {package}
 : $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
 
-ifdef DEPOT_KEY
-: {binary} |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/libretro/cores/tyrquake/Tuprules.tup b/libretro/cores/tyrquake/Tuprules.tup
index f918a4da8..72b2c7e6c 100644
--- a/libretro/cores/tyrquake/Tuprules.tup
+++ b/libretro/cores/tyrquake/Tuprules.tup
@@ -30,8 +30,5 @@ include upstream/Makefile.common
 : $(TUP_CWD)/archives |> !publish_core_archives |> {package}
 : $(TUP_CWD)/runtime |> !publish_core_runtime |> {package}
 
-ifdef DEPOT_KEY
-: {binary}  |> !core_bin_tarball |> {tarballs}
-: {package} |> !core_pkg_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
-endif
+: {binary}  |> !core_publish_bin |>
+: {package} |> !core_publish_pkg |>
diff --git a/nimble/binaries.tup b/nimble/binaries.tup
index 6373b589e..243478501 100644
--- a/nimble/binaries.tup
+++ b/nimble/binaries.tup
@@ -7,6 +7,5 @@ NIM_RELEASE_FLAG = -d:release
 : foreach {output} |> !strip_to_depot |> {binary}
 
 ifdef DEPOT_KEY
-: {binary} |> !depot_bin_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
+: {binary} |> !publish_bin |>
 endif
diff --git a/nimble/package.tup b/nimble/package.tup
index d5ad4d188..493d6fc08 100644
--- a/nimble/package.tup
+++ b/nimble/package.tup
@@ -4,6 +4,5 @@ include_rules
 : runtime | ./<binaries> |> !runtime_to_depot |> {package}
 
 ifdef DEPOT_KEY
-: {package} |> !depot_pkg_tarball |> {tarball}
-: {tarball} |> !public_signature |>
+: {package} |> !publish_pkg |>
 endif
diff --git a/runtimes/fetch-nixos/Tupfile b/runtimes/fetch-nixos/Tupfile
index 134880a5d..d14917aef 100644
--- a/runtimes/fetch-nixos/Tupfile
+++ b/runtimes/fetch-nixos/Tupfile
@@ -16,7 +16,6 @@ SHA256 = d8dcb02f96108720c451b0858dab42ac2ad6fc47442298b3a5338b14bfc76f30
 : machine.vdi |> !raw_to_depot |> {raw}
 
 ifdef DEPOT_KEY
-: {package} |> !depot_pkg_tarball |> {tarballs}
-: {raw} |> !depot_raw_tarball |> {tarballs}
-: foreach {tarballs} |> !public_signature |>
+: {package} |> !publish_pkg |>
+: {raw} |> !publish_raw |>
 endif
diff --git a/runtimes/icy-streams/icy-stream.tup b/runtimes/icy-streams/icy-stream.tup
index aa80b195e..7624d4ad4 100644
--- a/runtimes/icy-streams/icy-stream.tup
+++ b/runtimes/icy-streams/icy-stream.tup
@@ -6,6 +6,5 @@ include_rules
 : $(TUP_CWD)/archives |> !archives_to_depot |> {package}
 
 ifdef DEPOT_KEY
-: {package} |> !depot_pkg_tarball |> {tarball}
-: {tarball} |> !public_signature |>
+: {package} |> !publish_pkg |>
 endif