diff --git a/ChangeLog b/ChangeLog
index 09d3afbe0a..97af561c47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-28  Michael Natterer  <mitch@gimp.org>
+
+	* app/dialogs/about-dialog.c: set the new "wrap-license" property
+	on GtkAboutDialog and remove the explicit newlines from the string
+	holding the GPL.
+
 2005-12-28  Michael Natterer  <mitch@gimp.org>
 
 	* app/widgets/gimpwidgets-utils.[ch]: removed
diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c
index 4da534578c..9e50dd1173 100644
--- a/app/dialogs/about-dialog.c
+++ b/app/dialogs/about-dialog.c
@@ -41,21 +41,21 @@
   "Copyright (C) 1995-2005\n" \
   "Spencer Kimball, Peter Mattis and the GIMP Development Team"
 
-/* FIXME: let GTK+ do the wrapping (requires GTK+ 2.8) */
 #define LICENSE \
-  "This program is free software; you can redistribute it and/or modify\n" \
-  "it under the terms of the GNU General Public License as published by\n" \
-  "the Free Software Foundation; either version 2 of the License, or\n"    \
+  "This program is free software; you can redistribute it and/or modify "  \
+  "it under the terms of the GNU General Public License as published by "  \
+  "the Free Software Foundation; either version 2 of the License, or "     \
   "(at your option) any later version.\n"                                  \
   "\n"                                                                     \
-  "This program is distributed in the hope that it will be useful,\n"      \
-  "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"       \
-  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"                 \
+  "This program is distributed in the hope that it will be useful, "       \
+  "but WITHOUT ANY WARRANTY; without even the implied warranty of "        \
+  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. "                  \
   "See the GNU General Public License for more details.\n"                 \
   "\n"                                                                     \
-  "You should have received a copy of the GNU General Public License\n"    \
-  "along with this program; if not, write to the Free Software\n"          \
-  "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
+  "You should have received a copy of the GNU General Public License "     \
+  "along with this program; if not, write to the Free Software "           \
+  "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, " \
+  "USA."
 
 #define NAME           "GIMP"
 #define COMMENTS       _("GNU Image Manipulation Program")
@@ -144,6 +144,7 @@ about_dialog_create (GimpContext *context)
                              "copyright",          COPYRIGHT,
                              "comments",           COMMENTS,
                              "license",            LICENSE,
+                             "wrap-license",       TRUE,
                              "website",            WEBSITE,
                              "website-label",      WEBSITE_LABEL,
                              "authors",            authors,