diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index a3e855e95..5cf25df4b 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,17 @@
+1998-04-18  Mikael Djurfeldt  <mdj@mdj.nada.kth.se>
+
+	* Makefile.am (BUILT_SOURCES): Added cpp_err_symbols.c,
+	cpp_sig_symbols.c, libpath.h and versiondat.h to BUILT_SOURCES
+	(libpath.h, versiondat.h): Replaced dependency on Makefile with
+	dependencies on $(srcdir)/Makefile.in
+	$(top_builddir)/config.status in order to avoid circularity.
+
+	* script.c (scm_compile_shell_switches): Bugfix: Don't discount i
+	from argc if argc was 0 initially.
+
+	* Makefile.am (Makefile.am): Replaced THREAD_LIBS --> GUILE_LIBS
+	in generation of libpath.h.
+
 1998-04-15  Mikael Djurfeldt  <mdj@nada.kth.se>
 
 	* Makefile.am (libguile_la_LDFLAGS): Bumped version number of
diff --git a/libguile/script.c b/libguile/script.c
index a264106d2..786dc5a68 100644
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -591,7 +591,7 @@ scm_compile_shell_switches (int argc, char **argv)
 
   /* Make any remaining arguments available to the
      script/command/whatever.  */
-  scm_set_program_arguments (argc - i, argv + i, argv0);
+  scm_set_program_arguments (argc ? argc - i : 0, argv + i, argv0);
   
   /* If the --emacs switch was set, now is when we process it.  */
   scm_sysintern ("use-emacs-interface",