diff --git a/tcsh-6.19.00-023-fix-debugging-code.patch b/tcsh-6.19.00-023-fix-debugging-code.patch
new file mode 100644
index 0000000..efd8790
--- /dev/null
+++ b/tcsh-6.19.00-023-fix-debugging-code.patch
@@ -0,0 +1,87 @@
+From 9fdb7e1f4dadd7996d614b9cab95704fa22cf0d5 Mon Sep 17 00:00:00 2001
+From: christos <christos>
+Date: Fri, 15 Jan 2016 15:28:57 +0000
+Subject: [PATCH 1/2] PR/510: Masanarid Iida: Add missing paren (in debugging
+ code)
+
+---
+ ed.defns.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ed.defns.c b/ed.defns.c
+index 60ef193..a472e66 100644
+--- a/ed.defns.c
++++ b/ed.defns.c
+@@ -1805,7 +1805,7 @@ CheckMaps(void)
+ 
+     if ((sizeof(CcKeyMap)) != c1)
+ 	xprintf("CcKeyMap should be %d entries, but is %d.\r\n",
+-		NT_NUM_KEYS, sizeof(CcKeyMap) / sizeof(KEYCMD)));
++		NT_NUM_KEYS, (sizeof(CcKeyMap) / sizeof(KEYCMD)));
+ 
+     if ((sizeof(CcAltMap)) != c1)
+ 	xprintf("CcAltMap should be %d entries, but is %d.\r\n",
+-- 
+2.5.5
+
+
+From 3512c94faa44497e27959da78814777bdf8e0491 Mon Sep 17 00:00:00 2001
+From: christos <christos>
+Date: Sun, 14 Feb 2016 15:44:18 +0000
+Subject: [PATCH 2/2] PR/510: Masanari Iida: Fix debugging printfs.
+
+---
+ ed.defns.c | 32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/ed.defns.c b/ed.defns.c
+index a472e66..a4ed6a0 100644
+--- a/ed.defns.c
++++ b/ed.defns.c
+@@ -1801,27 +1801,27 @@ editinit(void)
+ void
+ CheckMaps(void)
+ {		/* check the size of the key maps */
+-    int     c1 = (NT_NUM_KEYS * sizeof(KEYCMD));
++    size_t     c1 = NT_NUM_KEYS * sizeof(KEYCMD);
+ 
+-    if ((sizeof(CcKeyMap)) != c1)
+-	xprintf("CcKeyMap should be %d entries, but is %d.\r\n",
+-		NT_NUM_KEYS, (sizeof(CcKeyMap) / sizeof(KEYCMD)));
++    if (sizeof(CcKeyMap) != c1)
++	xprintf("CcKeyMap should be %u entries, but is %zu.\r\n",
++		NT_NUM_KEYS, sizeof(CcKeyMap) / sizeof(KEYCMD));
+ 
+-    if ((sizeof(CcAltMap)) != c1)
+-	xprintf("CcAltMap should be %d entries, but is %d.\r\n",
+-		NT_NUM_KEYS, (sizeof(CcAltMap) / sizeof(KEYCMD)));
++    if (sizeof(CcAltMap) != c1)
++	xprintf("CcAltMap should be %u entries, but is %zu.\r\n",
++		NT_NUM_KEYS, sizeof(CcAltMap) / sizeof(KEYCMD));
+ 
+-    if ((sizeof(CcEmacsMap)) != c1)
+-	xprintf("CcEmacsMap should be %d entries, but is %d.\r\n",
+-		NT_NUM_KEYS, (sizeof(CcEmacsMap) / sizeof(KEYCMD)));
++    if (sizeof(CcEmacsMap) != c1)
++	xprintf("CcEmacsMap should be %u entries, but is %zu.\r\n",
++		NT_NUM_KEYS, sizeof(CcEmacsMap) / sizeof(KEYCMD));
+ 
+-    if ((sizeof(CcViMap)) != c1)
+-	xprintf("CcViMap should be %d entries, but is %d.\r\n",
+-		NT_NUM_KEYS, (sizeof(CcViMap) / sizeof(KEYCMD)));
++    if (sizeof(CcViMap) != c1)
++	xprintf("CcViMap should be %u entries, but is %zu.\r\n",
++		NT_NUM_KEYS, sizeof(CcViMap) / sizeof(KEYCMD));
+ 
+-    if ((sizeof(CcViCmdMap)) != c1)
+-	xprintf("CcViCmdMap should be %d entries, but is %d.\r\n",
+-		NT_NUM_KEYS, (sizeof(CcViCmdMap) / sizeof(KEYCMD)));
++    if (sizeof(CcViCmdMap) != c1)
++	xprintf("CcViCmdMap should be %u entries, but is %zu.\r\n",
++		NT_NUM_KEYS, sizeof(CcViCmdMap) / sizeof(KEYCMD));
+ }
+ 
+ #endif
+-- 
+2.5.5
+
diff --git a/tcsh.spec b/tcsh.spec
index 3b9b155..d33a02e 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -51,6 +51,7 @@ Patch019: tcsh-6.19.00-019-fix-uninitialized-estr.patch
 Patch020: tcsh-6.19.00-020-make-heredoc-interruptible-again.patch
 Patch021: tcsh-6.19.00-021-remove-extra-semicolon.patch
 Patch022: tcsh-6.19.00-022-fix-source-command-memory-leak.patch
+Patch023: tcsh-6.19.00-023-fix-debugging-code.patch
 
 
 # Downstream patches -- these should be always included when doing rebase:
@@ -194,6 +195,7 @@ fi
     tcsh-6.19.00-020-make-heredoc-interruptible-again.patch
     tcsh-6.19.00-021-remove-extra-semicolon.patch
     tcsh-6.19.00-022-fix-source-command-memory-leak.patch
+    tcsh-6.19.00-023-fix-debugging-code.patch
 
 * Thu Apr 21 2016 David Kaspar [Dee'Kej] <dkaspar@redhat.com> - 6.19.00-6
 - Drop tcsh-6.15.00-closem.patch - issue not reproducible, patch not accepted by upstream