Index: stage-cd
===================================================================
--- stage-cd	(revision 222)
+++ stage-cd	(working copy)
@@ -30,9 +30,12 @@
 	tar -cf  $DISTRONAME_L-cdsource-$RELEASE-$LIVECD_VERSION.tar $DISTRONAME_L-cdsource-$RELEASE-$LIVECD_VERSION
 	cd $REPODST/cdimage
 	mv $LIVECDDIR-src/$DISTRONAME_L-cdsource-$RELEASE-$LIVECD_VERSION.tar .
-	sed -i "/ $DISTRONAME_L-cdsource-$RELEASE-$LIVECD_VERSION.tar$/d" MD5SUMS
-	md5sum $DISTRONAME_L-cdsource-$RELEASE-$LIVECD_VERSION.tar >> MD5SUMS
+	sed -i "/ $DISTRONAME_L-cdsource-$RELEASE-$LIVECD_VERSION.tar$/d" $SUMFILE
+	for i in "${SUMLIST[*]}"
+	do
+	    $i $DISTRONAME_L-cdsource-$RELEASE-$LIVECD_VERSION.tar >> $SUMFILE
+	done
 fi
 cd $REPODST/cdimage
-gpg -u $SIGNINGKEY --clearsign MD5SUMS
-mv MD5SUMS.asc MD5SUMS.gpg
+
+gpg -u $SIGNINGKEY --detach-sign --armor --output ${SUMFILE}.gpg $SUMFILE
Index: gen-livecd
===================================================================
--- gen-livecd	(revision 222)
+++ gen-livecd	(working copy)
@@ -190,5 +190,8 @@
 # Here we stage the cd image
 cd $REPODST/cdimage
 btmakemetafile.bittornado http://torrent.$DOMAIN:6969/announce --announce_list "$BITTORRENT_ANNOUNCE_LIST" $LIVECD_ISO_PREFIX-livecd-$RELEASE-$LIVECD_VERSION.iso
-sed -i "/ $LIVECD_ISO_PREFIX-livecd-$LIVECD_VERSION.iso$/d" MD5SUMS || true  # Might not exist yet
-md5sum $LIVECD_ISO_PREFIX-livecd-$RELEASE-$LIVECD_VERSION.iso >> MD5SUMS
+sed -i "/ $LIVECD_ISO_PREFIX-livecd-$LIVECD_VERSION.iso$/d" $SUMFILE || true  # Might not exist yet
+for i in ${SUMLIST[*]}
+do
+    $i $LIVECD_ISO_PREFIX-livecd-$RELEASE-$LIVECD_VERSION.iso >> $SUMFILE
+done
Index: config
===================================================================
--- config	(revision 222)
+++ config	(working copy)
@@ -117,3 +117,8 @@
 
 # Without this, the diff cleaning for gen-kernel will break. Probably affects other stuff too.
 LANG=C
+
+# List of *sum programs to use
+declare -a SUMLIST=("md5sum" "shasum" "sha512sum")
+# Where we're putting the output from the above
+SUMFILE="SUMS"