diff --git a/ChangeLog b/ChangeLog
index 7956b8af6..a6cd577ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-08  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 36008: Src/builtin.c: trap: Fix listing of traps created
+	under non-alias non-canonical signal spelling
+
 2015-08-08  Mikael Magnusson  <mikachu@gmail.com>
 
 	* 35954: Doc/Zsh/mod_system.yo: sysopen -u is not optional
diff --git a/Src/builtin.c b/Src/builtin.c
index a08a7d468..34bad035d 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -6565,8 +6565,14 @@ bin_trap(char *name, char **argv, UNUSED(Options ops), UNUSED(int func))
 	    zwarnnam(name, "undefined signal: %s", *argv);
 	    break;
 	}
-	if (!strcmp(sigs[sig], *argv))
+	if (idigit(**argv) ||
+	    !strcmp(sigs[sig], *argv) ||
+	    (!strncmp("SIG", *argv, 3) && !strcmp(sigs[sig], *argv+3))) {
+	    /* The signal was specified by number or by canonical name (with
+	     * or without SIG prefix).
+	     */
 	    flags = 0;
+	}
 	else {
 	    /*
 	     * Record that the signal is used under an assumed name.