diff --git a/libgimp/gimp.c b/libgimp/gimp.c
index a2c64877d1..80233509fd 100644
--- a/libgimp/gimp.c
+++ b/libgimp/gimp.c
@@ -126,17 +126,6 @@
 #include "libgimp-intl.h"
 
 
-/**
- * SECTION: gimp
- * @title: Gimp
- * @short_description: Main functions needed for building a GIMP plug-in.
- *                     This header includes all other GIMP Library headers.
- *
- * Main functions needed for building a GIMP plug-in. This header
- * includes all other GIMP Library headers.
- **/
-
-
 #define TILE_MAP_SIZE (_tile_width * _tile_height * 32)
 
 #define ERRMSG_SHM_FAILED "Could not attach to gimp shared memory segment"
diff --git a/libgimp/gimp_pdb.c b/libgimp/gimp_pdb.c
index 74beecef96..cfcafa6175 100644
--- a/libgimp/gimp_pdb.c
+++ b/libgimp/gimp_pdb.c
@@ -26,11 +26,15 @@
 
 
 /**
- * SECTION: gimp
- * @title: gimp
- * @short_description: Miscellaneous procedures
+ * SECTION: Gimp
+ * @title: Gimp
+ * @short_description: Main functions needed for building a GIMP plug-in.
  *
- * Miscellaneous procedures not fitting in any category.
+ * Main functions needed for building a GIMP plug-in.
+ * This header includes all other GIMP Library headers.
+ *
+ * Also contains some miscellaneous procedures that don't fit in any
+ * other category.
  **/
 
 
diff --git a/pdb/groups/gimp.pdb b/pdb/groups/gimp.pdb
index 30492e1721..3b7c4a7c12 100644
--- a/pdb/groups/gimp.pdb
+++ b/pdb/groups/gimp.pdb
@@ -237,8 +237,15 @@ CODE
 %exports = (app => [@procs], lib => [@procs[0..1,3..7]]);
 
 $desc = 'Miscellaneous';
-$doc_title = 'gimp';
-$doc_short_desc = 'Miscellaneous procedures';
-$doc_long_desc = 'Miscellaneous procedures not fitting in any category.';
+$doc_title = 'Gimp';
+
+$doc_short_desc = 'Main functions needed for building a GIMP plug-in.';
+$doc_long_desc = <<'DESC';
+Main functions needed for building a GIMP plug-in.
+This header includes all other GIMP Library headers.
+
+Also contains some miscellaneous procedures that don't fit in any
+other category.
+DESC
 
 1;
diff --git a/pdb/lib.pl b/pdb/lib.pl
index 23e49bd4f5..8970479dba 100644
--- a/pdb/lib.pl
+++ b/pdb/lib.pl
@@ -35,6 +35,7 @@ sub desc_wrap {
     my $leading = ' * ';
     my $wrapped;
 
+    $str =~ s/\s+$//; # trim trailing whitespace
     $str =~ s/&/&amp\;/g;
     $str =~ s/\</&lt\;/g;
     $str =~ s/\>/&gt\;/g;