diff --git a/[refs] b/[refs]
index 7a60978758ef..40e3d36cf542 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01f1c8799ad8b23c190d59cf1c9e28e6fed390a4
+refs/heads/master: 14a036d2dc304797f3624c06bd6d2a1e9b59e45a
diff --git a/trunk/scripts/unifdef.c b/trunk/scripts/unifdef.c
index 5384b4377333..552025e72acb 100644
--- a/trunk/scripts/unifdef.c
+++ b/trunk/scripts/unifdef.c
@@ -450,7 +450,14 @@ ignoreon(void)
 static void
 keywordedit(const char *replacement)
 {
-	strlcpy(keyword, replacement, tline + sizeof(tline) - keyword);
+	size_t size = tline + sizeof(tline) - keyword;
+	char *dst = keyword;
+	const char *src = replacement;
+	if (size != 0) {
+		while ((--size != 0) && (*src != '\0'))
+			*dst++ = *src++;
+		*dst = '\0';
+	}
 	print();
 }
 static void