diff --git a/.cvsignore b/.cvsignore
index a1a4c366c..a5a897311 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 busybox
+busybox.links
diff --git a/archival/gzip.c b/archival/gzip.c
index 0ed20b61a..7571a3f6a 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -380,7 +380,7 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #  undef LZW
 #endif
 
-/* $Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $ */
+/* $Id: gzip.c,v 1.5 1999/10/23 07:09:58 andersen Exp $ */
 /* tailor.h -- target dependent definitions
  * Copyright (C) 1992-1993 Jean-loup Gailly.
  * This is free software; you can redistribute it and/or modify it under the
@@ -391,7 +391,7 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
  * The target dependent functions should be defined in tailor.c.
  */
 
-/* $Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $ */
+/* $Id: gzip.c,v 1.5 1999/10/23 07:09:58 andersen Exp $ */
 
 #if defined(__MSDOS__) && !defined(MSDOS)
 #  define MSDOS
@@ -766,10 +766,6 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #  include <stdio.h>
 #endif
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 /* ===========================================================================
  * Local data used by the "bit string" routines.
  */
@@ -975,10 +971,6 @@ void copy_block(buf, len, header)
 
 #include <stdio.h>
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 /* ===========================================================================
  * Configuration parameters
  */
@@ -1591,10 +1583,6 @@ ulg deflate()
  * For the meaning of all compilation flags, see comments in Makefile.in.
  */
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 #include <ctype.h>
 #include <sys/types.h>
 #include <signal.h>
@@ -1924,10 +1912,6 @@ local void do_exit(int exitcode)
 
 #include <ctype.h>
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 /* ===========================================================================
  * Constants
  */
@@ -2942,10 +2926,6 @@ local void set_file_type()
  * terms of the GNU General Public License, see the file COPYING.
  */
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 #include <ctype.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -3141,10 +3121,6 @@ void display_ratio(num, den, file)
  * terms of the GNU General Public License, see the file COPYING.
  */
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 #include <ctype.h>
 #include <sys/types.h>
 
diff --git a/busybox.def.h b/busybox.def.h
index 033ccca84..845e46382 100644
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -40,7 +40,7 @@
 //#define BB_PRINTF
 #define BB_PS
 #define BB_PWD
-#define BB_REGEXP
+//#define BB_REGEXP
 #define BB_REBOOT
 #define BB_RM
 #define BB_RMDIR
diff --git a/gzip.c b/gzip.c
index 0ed20b61a..7571a3f6a 100644
--- a/gzip.c
+++ b/gzip.c
@@ -380,7 +380,7 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #  undef LZW
 #endif
 
-/* $Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $ */
+/* $Id: gzip.c,v 1.5 1999/10/23 07:09:58 andersen Exp $ */
 /* tailor.h -- target dependent definitions
  * Copyright (C) 1992-1993 Jean-loup Gailly.
  * This is free software; you can redistribute it and/or modify it under the
@@ -391,7 +391,7 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
  * The target dependent functions should be defined in tailor.c.
  */
 
-/* $Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $ */
+/* $Id: gzip.c,v 1.5 1999/10/23 07:09:58 andersen Exp $ */
 
 #if defined(__MSDOS__) && !defined(MSDOS)
 #  define MSDOS
@@ -766,10 +766,6 @@ extern int block_mode;   /* block compress mode -C compatible with 2.0 */
 #  include <stdio.h>
 #endif
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 /* ===========================================================================
  * Local data used by the "bit string" routines.
  */
@@ -975,10 +971,6 @@ void copy_block(buf, len, header)
 
 #include <stdio.h>
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 /* ===========================================================================
  * Configuration parameters
  */
@@ -1591,10 +1583,6 @@ ulg deflate()
  * For the meaning of all compilation flags, see comments in Makefile.in.
  */
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 #include <ctype.h>
 #include <sys/types.h>
 #include <signal.h>
@@ -1924,10 +1912,6 @@ local void do_exit(int exitcode)
 
 #include <ctype.h>
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 /* ===========================================================================
  * Constants
  */
@@ -2942,10 +2926,6 @@ local void set_file_type()
  * terms of the GNU General Public License, see the file COPYING.
  */
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 #include <ctype.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -3141,10 +3121,6 @@ void display_ratio(num, den, file)
  * terms of the GNU General Public License, see the file COPYING.
  */
 
-#ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1999/10/19 20:03:34 andersen Exp $";
-#endif
-
 #include <ctype.h>
 #include <sys/types.h>
 
diff --git a/zcat.c b/zcat.c
index 55aaa8738..30916b155 100644
--- a/zcat.c
+++ b/zcat.c
@@ -58,10 +58,6 @@ static char  *license_msg[] = {
  * For the meaning of all compilation flags, see comments in Makefile.in.
  */
 
-#ifdef RCSID
-static char rcsid[] = "$Id: zcat.c,v 1.4 1999/10/19 22:26:25 andersen Exp $";
-#endif
-
 #include <ctype.h>
 #include <sys/types.h>
 #include <signal.h>
@@ -80,7 +76,7 @@ static char rcsid[] = "$Id: zcat.c,v 1.4 1999/10/19 22:26:25 andersen Exp $";
  * The target dependent functions should be defined in tailor.c.
  */
 
-/* $Id: zcat.c,v 1.4 1999/10/19 22:26:25 andersen Exp $ */
+/* $Id: zcat.c,v 1.5 1999/10/23 07:09:58 andersen Exp $ */
 
 #define RECORD_IO 0
 
@@ -436,7 +432,7 @@ extern int unlzw  OF((int in, int out));
 #  undef LZW
 #endif
 
-/* $Id: zcat.c,v 1.4 1999/10/19 22:26:25 andersen Exp $ */
+/* $Id: zcat.c,v 1.5 1999/10/23 07:09:58 andersen Exp $ */
 
 /* #include "getopt.h" */
 
@@ -894,10 +890,6 @@ RETSIGTYPE abort_gzip()
    either deflated or stored.
  */
 
-#ifdef RCSID
-static char rcsid[] = "$Id: zcat.c,v 1.4 1999/10/19 22:26:25 andersen Exp $";
-#endif
-
 /* #include "crypt.h" */
 
 /* crypt.h (dummy version) -- do not perform encryption
@@ -1020,10 +1012,6 @@ int unzip(in, out)
  * terms of the GNU General Public License, see the file COPYING.
  */
 
-#ifdef RCSID
-static char rcsid[] = "$Id: zcat.c,v 1.4 1999/10/19 22:26:25 andersen Exp $";
-#endif
-
 #include <ctype.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -1407,10 +1395,6 @@ const ulg crc_32_tab[] = {
       the two sets of lengths.
  */
 
-#ifdef RCSID
-static char rcsid[] = "$Id: zcat.c,v 1.4 1999/10/19 22:26:25 andersen Exp $";
-#endif
-
 #include <sys/types.h>
 
 #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H)