--- a/src/octave.cc	Wed Oct 28 17:51:09 1998 +0000
+++ b/src/octave.cc	Wed Oct 28 23:01:17 1998 +0000
@@ -58,6 +58,7 @@
 #include "input.h"
 #include "lex.h"
 #include "oct-hist.h"
+#include "oct-obj.h"
 #include "ops.h"
 #include "toplev.h"
 #include "parse.h"
@@ -153,17 +154,20 @@
 static void
 intern_argv (int argc, char **argv)
 {
+  bind_builtin_variable ("nargin", static_cast<double> (argc-1), 1, 1, 0);
+
+  octave_value_list octave_argv;
+
   if (argc > 1)
     {
       // Skip program name in argv.
-
-      octave_argv = string_vector (argv+1, argc-1);
+      while (--argc > 0)
+	octave_argv(argc-1) = octave_value (*(argv+argc));
 
-      bind_builtin_variable ("argv", octave_argv, 1, 1, 0);
-      bind_builtin_variable ("__argv__", octave_argv, 1, 1, 0);
     }
 
-  bind_builtin_variable ("nargin", static_cast<double> (argc-1), 1, 1, 0);
+  bind_builtin_variable ("argv", octave_argv, 1, 1, 0);
+  bind_builtin_variable ("__argv__", octave_argv, 1, 1, 0);
 }
 
 static void