diff --git a/hgeditor b/hgeditor
--- a/hgeditor
+++ b/hgeditor
@@ -36,11 +36,11 @@ else
 
     CHECKSUM=`md5sum "$T1"`
     $EDITOR "$T1" "$T2" || cleanup_exit $?
-    echo "$CHECKSUM" | md5sum -c 2>/dev/null && cleanup_exit 0
+    echo "$CHECKSUM" | md5sum -c --status && cleanup_exit 13
     {
-        head -1 "$T1"
+        head -n 1 "$T1"
         echo
-        grep -v "^HG:" "$T1" | gpg -a -u "${HGUSER:-$EMAIL}" --clearsign
+        grep -v "^HG:" "$T1" | gpg -t -a -u "${HGUSER:-$EMAIL}" --clearsign
     } > "$T2" && mv "$T2" "$1"
     cleanup_exit $?
 fi