diff --git a/src/channel.c b/src/channel.c
index ba9f9c7..98bc6be 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2284,11 +2284,11 @@
 channel_part_info(channel_T *channel, dict_T *dict, char *name, int part)
 {
     chanpart_T *chanpart = &channel->ch_part[part];
-    char	namebuf[20];
+    char	namebuf[20];  /* longest is "sock_timeout" */
     size_t	tail;
     char	*s = "";
 
-    STRCPY(namebuf, name);
+    vim_strncpy((char_u *)namebuf, (char_u *)name, 4);
     STRCAT(namebuf, "_");
     tail = STRLEN(namebuf);
 
diff --git a/src/version.c b/src/version.c
index e1f7a2a..4778bfe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1680,
+/**/
     1679,
 /**/
     1678,