diff --git a/ChangeLog b/ChangeLog
index 7d70c18112fdce156d743c48b3a2b7a7b73064ef..17ba4ca50d977414e8dd0cfc760ea935614e3377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-12-27  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcellrenderertext.c: Fix the default value for the
+	wrap-mode and font-scale properties.
+
 	* gtk/gtkaspectratio.c: Fix the default value for the ratio
 	property.
 
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index e65057dcefb1b0921313beb9c3cbf0d342311dad..fefcabbffd9bfbe73b3060d04de37608060382a8 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -163,11 +163,13 @@ gtk_cell_renderer_text_init (GtkCellRendererText *celltext)
   GTK_CELL_RENDERER (celltext)->yalign = 0.5;
   GTK_CELL_RENDERER (celltext)->xpad = 2;
   GTK_CELL_RENDERER (celltext)->ypad = 2;
+  celltext->font_scale = 1.0;
   celltext->fixed_height_rows = -1;
   celltext->font = pango_font_description_new ();
 
   priv->width_chars = -1;
   priv->wrap_width = -1;
+  priv->wrap_mode = PANGO_WRAP_CHAR;
   priv->align = PANGO_ALIGN_LEFT;
   priv->align_set = FALSE;
 }
@@ -1075,7 +1077,7 @@ gtk_cell_renderer_text_set_property (GObject      *object,
         GdkColor color;
 
         if (!g_value_get_string (value))
-          set_bg_color (celltext, NULL);       /* reset to backgrounmd_set to FALSE */
+          set_bg_color (celltext, NULL);       /* reset to background_set to FALSE */
         else if (gdk_color_parse (g_value_get_string (value), &color))
           set_bg_color (celltext, &color);
         else