diff --git a/ChangeLog b/ChangeLog
index c193f0ecd0..011342cdad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-01-06  Matthias Clasen  <mclasen@redhat.com> 
 
+	* gtk/gtkviewport.c (viewport_set_adjustment): Disconnect from
+	the old adjustments signals.  (#325869, Jorn Baayen)
+
 	* NEWS: Updates
 
 2006-01-05  Johan Dahlin  <jdahlin@async.com.br>
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c193f0ecd0..011342cdad 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-01-06  Matthias Clasen  <mclasen@redhat.com> 
 
+	* gtk/gtkviewport.c (viewport_set_adjustment): Disconnect from
+	the old adjustments signals.  (#325869, Jorn Baayen)
+
 	* NEWS: Updates
 
 2006-01-05  Johan Dahlin  <jdahlin@async.com.br>
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index c87da8b200..6a79941d58 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -464,8 +464,8 @@ viewport_set_adjustment (GtkViewport    *viewport,
   if (!adjustment)
     adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0,
 						     0.0, 0.0, 0.0));
-  if (*adjustmentp)
-    g_object_unref (*adjustmentp);
+
+  viewport_disconnect_adjustment (viewport, orientation);
   *adjustmentp = adjustment;
   g_object_ref (adjustment);
   gtk_object_sink (GTK_OBJECT (adjustment));