diff --git a/ipmitool/src/ipmishell.c b/ipmitool/src/ipmishell.c
index 3950980..38580e2 100644
--- a/ipmitool/src/ipmishell.c
+++ b/ipmitool/src/ipmishell.c
@@ -129,7 +129,9 @@ int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
 		add_history(pbuf);
 		
 		__argc = 0;
-		for (ap = __argv; (*ap = strsep(&pbuf, " \t")) != NULL;) {
+		ap = __argv;
+
+		for (*ap = strtok(pbuf, " \t"); *ap != NULL; *ap = strtok(NULL, " \t")) {
 			__argc++;
 			if (**ap != '\0') {
 				if (++ap >= &__argv[20])