diff --git a/ChangeLog b/ChangeLog
index 7423ff7642..dded344021 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-13  Manish Singh  <yosh@gimp.org>
+
+	* tools/pdbgen/lib.pl: autogenerated libgimp/gimp_pdb.h
+
+	* tools/pdbgen/app.pl: fix a bug in the file open error message
+
+	* libgimp/gimp_pdb.h: now generated
+
 2002-03-13  Sven Neumann  <sven@gimp.org>
 
 	* app/Makefile.am (SUBDIRS): moved pdb directory to the end.
diff --git a/libgimp/gimp_pdb.h b/libgimp/gimp_pdb.h
index 8a91b5bb37..13b435e89a 100644
--- a/libgimp/gimp_pdb.h
+++ b/libgimp/gimp_pdb.h
@@ -1,5 +1,5 @@
 /* LIBGIMP - The GIMP Library
- * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
+ * Copyright (C) 1995-2000 Peter Mattis and Spencer Kimball
  *
  * gimp_pdb.h
  *
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+/* NOTE: This file is autogenerated by pdbgen.pl */
+
 #ifndef __GIMP_PDB_H__
 #define __GIMP_PDB_H__
 
@@ -50,8 +52,8 @@
 #include <libgimp/gimppaths_pdb.h>
 #include <libgimp/gimppatterns_pdb.h>
 #include <libgimp/gimppatternselect_pdb.h>
-#include <libgimp/gimpproceduraldb_pdb.h>
 #include <libgimp/gimpplugin_pdb.h>
+#include <libgimp/gimpproceduraldb_pdb.h>
 #include <libgimp/gimpselection_pdb.h>
 #include <libgimp/gimpselectiontools_pdb.h>
 #include <libgimp/gimptexttool_pdb.h>
diff --git a/tips/.cvsignore b/tips/.cvsignore
index 4d5023df67..70bad7d1c4 100644
--- a/tips/.cvsignore
+++ b/tips/.cvsignore
@@ -8,3 +8,4 @@ gimp-tips.xml
 gimp-tips.xml.in.h
 messages
 .intltool-merge-cachemake
+.memdump
diff --git a/tools/pdbgen/app.pl b/tools/pdbgen/app.pl
index 37109bcd41..7609d2775d 100644
--- a/tools/pdbgen/app.pl
+++ b/tools/pdbgen/app.pl
@@ -841,7 +841,7 @@ GPL
 
     if (! $ENV{PDBGEN_GROUPS}) {
 	my $internal = "$destdir/internal_procs.h$FILE_EXT";
-	open IFILE, "> $internal" or die "Can't open $cmdfile: $!\n";
+	open IFILE, "> $internal" or die "Can't open $internal: $!\n";
 	print IFILE $gpl;
 	my $guard = "__INTERNAL_PROCS_H__";
 	print IFILE <<HEADER;
@@ -857,7 +857,7 @@ HEADER
 	&write_file($internal);
 
 	$internal = "$destdir/internal_procs.c$FILE_EXT";
-	open IFILE, "> $internal" or die "Can't open $cmdfile: $!\n";
+	open IFILE, "> $internal" or die "Can't open $internal: $!\n";
 	print IFILE $gpl;
 	print IFILE qq@#include "config.h"\n\n@;
 	print IFILE qq@#include <glib-object.h>\n\n@;
diff --git a/tools/pdbgen/lib.pl b/tools/pdbgen/lib.pl
index 6787db887f..6cac0c8ae7 100644
--- a/tools/pdbgen/lib.pl
+++ b/tools/pdbgen/lib.pl
@@ -604,4 +604,33 @@ HEADER
 	close CFILE;
 	&write_file($cfile);
     }
+
+    if (! $ENV{PDBGEN_GROUPS}) {
+        my $gimp_pdb = "$destdir/gimp_pdb.h$FILE_EXT";
+	open PFILE, "> $gimp_pdb" or die "Can't open $gimp_pdb: $!\n";
+        print PFILE $lgpl_top;
+        print PFILE " * gimp_pdb.h\n";
+        print PFILE $lgpl_bottom;
+	my $guard = "__GIMP_PDB_H__";
+	print PFILE <<HEADER;
+#ifndef $guard
+#define $guard
+
+HEADER
+	my @groups;
+	foreach $group (keys %out) {
+	    my $hname = "gimp${group}pdb.h";
+	    $hname =~ s/_//g; $hname =~ s/pdb\./_pdb./;
+	    push @groups, $hname;
+	}
+	foreach $group (sort @groups) {
+	    print PFILE "#include <libgimp/$group>\n";
+	}
+	print PFILE <<HEADER;
+
+#endif /* $guard */
+HEADER
+	close PFILE;
+	&write_file($gimp_pdb);
+    }
 }