diff --git a/ChangeLog b/ChangeLog
index 428ad65ec4..63c11be2ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2008-05-28  Michael Natterer  <mitch@gimp.org>
+2008-05-28  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkcolorbutton.h: fix comment: the widget is called
+	GtkColorButton, not GtkColorSelectButton. Remove trailing
+	whitespace and excess newlines.
+
+2008-05-28  Michael Natterer  <mitch@imendio.com>
 
 	* configure.in: last but not least, add G_DISABLE_SINGLE_INCLUDES,
 	GDK_PIXBUF_DISABLE_SINGLE_INCLUDES and GTK_DISABLE_SINGLE_INCLUDES
diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index f9ee40e166..66d91bea5e 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -18,6 +18,7 @@
  * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
 /* Color picker button for GNOME
  *
  * Author: Federico Mena <federico@nuclecu.unam.mx>
@@ -25,7 +26,7 @@
  * Modified by the GTK+ Team and others 2003.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
@@ -41,9 +42,9 @@
 G_BEGIN_DECLS
 
 
-/* The GtkColorSelectionButton widget is a simple color picker in a button.  
- * The button displays a sample of the currently selected color.  When 
- * the user clicks on the button, a color selection dialog pops up.  
+/* The GtkColorButton widget is a simple color picker in a button.
+ * The button displays a sample of the currently selected color.  When
+ * the user clicks on the button, a color selection dialog pops up.
  * The color picker emits the "color_set" signal when the color is set.
  */
 
@@ -68,9 +69,9 @@ struct _GtkColorButton {
 
 struct _GtkColorButtonClass {
   GtkButtonClass parent_class;
-  
+
   void (* color_set) (GtkColorButton *cp);
-  
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -82,17 +83,17 @@ struct _GtkColorButtonClass {
 GType      gtk_color_button_get_type       (void) G_GNUC_CONST;
 GtkWidget *gtk_color_button_new            (void);
 GtkWidget *gtk_color_button_new_with_color (const GdkColor *color);
-void       gtk_color_button_set_color      (GtkColorButton *color_button, 
+void       gtk_color_button_set_color      (GtkColorButton *color_button,
 					    const GdkColor *color);
 void       gtk_color_button_set_alpha      (GtkColorButton *color_button,
 					    guint16         alpha);
-void       gtk_color_button_get_color      (GtkColorButton *color_button, 
+void       gtk_color_button_get_color      (GtkColorButton *color_button,
 					    GdkColor       *color);
 guint16    gtk_color_button_get_alpha      (GtkColorButton *color_button);
-void       gtk_color_button_set_use_alpha  (GtkColorButton *color_button, 
+void       gtk_color_button_set_use_alpha  (GtkColorButton *color_button,
 					    gboolean        use_alpha);
 gboolean   gtk_color_button_get_use_alpha  (GtkColorButton *color_button);
-void       gtk_color_button_set_title      (GtkColorButton *color_button, 
+void       gtk_color_button_set_title      (GtkColorButton *color_button,
 					    const gchar    *title);
 G_CONST_RETURN gchar *gtk_color_button_get_title (GtkColorButton *color_button);
 
@@ -100,7 +101,3 @@ G_CONST_RETURN gchar *gtk_color_button_get_title (GtkColorButton *color_button);
 G_END_DECLS
 
 #endif  /* __GTK_COLOR_BUTTON_H__ */
-
-
-
-