diff --git a/man/pike.1 b/man/pike.1
index 9b84487a46f6a619ca45cdcddeb1a94bbb22548d..28829036665533145fec6b7ec45d52a3e8e217fe 100644
--- a/man/pike.1
+++ b/man/pike.1
@@ -1,11 +1,11 @@
-.\" $Id: pike.1,v 1.22 2003/05/22 08:49:27 mast Exp $
+.\" $Id: pike.1,v 1.23 2004/03/17 19:29:56 mast Exp $
 .\" name section last-modified title section-name product/status architecture
 .ds ]L Pike
-.TH pike 1 "$Date: 2003/05/22 08:49:27 $" Pike "Pike Manual" Pike
-.\" On Solaris ]L will contain "Last modified $Date: 2003/05/22 08:49:27 $"
+.TH pike 1 "$Date: 2004/03/17 19:29:56 $" Pike "Pike Manual" Pike
+.\" On Solaris ]L will contain "Last modified $Date: 2004/03/17 19:29:56 $"
 .\" while HPUX uses ]L to contain "Pike".
 .\" On OSF/1 ]L will already contain the wanted string.
-.if !\*(]LPike .ds ]L $Date: 2003/05/22 08:49:27 $ \" Solaris nroff
+.if !\*(]LPike .ds ]L $Date: 2004/03/17 19:29:56 $ \" Solaris nroff
 .\" Major (mj) and minor (mn) version of Pike
 .nr mj 7
 .nr mn 5
@@ -101,6 +101,9 @@ Set the level of runtime trace to
 .I num
 (debug).
 .TP
+.B \-tg
+Log the gc runs to stderr.
+.TP
 .B \-p
 Increase the level of profiling with 1 (debug).
 .TP
diff --git a/src/main.c b/src/main.c
index ddd703d4e1447131d49785a731165d8a94dddc03..f7bdeec88457a30548b8b774a0c096b3f41befd0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,11 +2,11 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: main.c,v 1.195 2004/03/16 18:33:45 mast Exp $
+|| $Id: main.c,v 1.196 2004/03/17 19:29:56 mast Exp $
 */
 
 #include "global.h"
-RCSID("$Id: main.c,v 1.195 2004/03/16 18:33:45 mast Exp $");
+RCSID("$Id: main.c,v 1.196 2004/03/17 19:29:56 mast Exp $");
 #include "fdlib.h"
 #include "backend.h"
 #include "module.h"
@@ -526,10 +526,23 @@ int dbm_main(int argc, char **argv)
 	  break;
 
 	case 't':
-	  if(p[1]>='0' && p[1]<='9')
-	    Pike_interpreter.trace_level+=STRTOL(p+1,&p,10);
-	  else
-	    Pike_interpreter.trace_level++,p++;
+	  more_t_flags:
+	  switch (p[1]) {
+	    case '0': case '1': case '2': case '3': case '4':
+	    case '5': case '6': case '7': case '8': case '9':
+	      Pike_interpreter.trace_level+=STRTOL(p+1,&p,10);
+	      break;
+
+	    case 'g':
+	      gc_trace++;
+	      p++;
+	      goto more_t_flags;
+
+	    default:
+	      if (p[0] == 't')
+		Pike_interpreter.trace_level++;
+	      p++;
+	  }
 	  default_t_flag = Pike_interpreter.trace_level;
 	  break;