diff --git a/board/k+p/bootscripts/tpcboot.cmd b/board/k+p/bootscripts/tpcboot.cmd
index ebd2d4ec2a..e26fd72825 100644
--- a/board/k+p/bootscripts/tpcboot.cmd
+++ b/board/k+p/bootscripts/tpcboot.cmd
@@ -65,17 +65,14 @@ fi"
 #
 # Provide 'boot_nfs' command
 #------------------------------------------------------------
-setenv nfsargs "setenv bootargs root=/dev/nfs rw \
-       nfsroot=${serverip}:${rootpath},nolock,nfsvers=3"
-setenv addip "setenv bootargs ${bootargs} \
-       ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:\
-       ${hostname}:eth0:on"
+setenv nfsargs "setenv bootargs root=/dev/nfs rw nfsroot='${serverip}':'${rootpath}',nolock,nfsvers=3"
+setenv addip "setenv bootargs '${bootargs}' ip='${ipaddr}':'${serverip}':'${gatewayip}':'${netmask}':'${hostname}':eth0:on"
 
 setenv boot_nfs "
 if run download_kernel; then
 	run nfsargs;
 	run addip;
-	setenv bootargs ${bootargs} console=${console};
+	setenv bootargs '${bootargs}' console=${console};
 
 	run boot_fitImage;
 fi"