diff --git a/src/lib/linuxbiosmain.c b/src/lib/linuxbiosmain.c
index 5898522116..bec7ff28ad 100644
--- a/src/lib/linuxbiosmain.c
+++ b/src/lib/linuxbiosmain.c
@@ -122,7 +122,8 @@ printk("Got block, bufptr = %lu, size= %u\n",bufptr, buflen);
 	printk("Initrd loaded\n");
 
 	if(tftp_init("cmdline") >=0) {
-		tftp_fetchone(buffer);
+                buflen = tftp_fetchone(buffer);
+                buffer[buflen] = '\0';
 		cmd_line=buffer;
 	}