diff --git a/ChangeLog b/ChangeLog
index b4138238e2..f90157990d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +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)
+
 2006-01-06  Hans Breuer  <hans@breuer.org>
 
 	* tests/makefile.msc : added a bunch of tests
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b4138238e2..f90157990d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +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)
+
 2006-01-06  Hans Breuer  <hans@breuer.org>
 
 	* tests/makefile.msc : added a bunch of tests
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index e89b2119e3..be304a3aff 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -464,8 +464,7 @@ 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_sink (adjustment);