diff --git a/ChangeLog b/ChangeLog
index c088564ab..a9594c705 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-18  Elijah Newren  <newren gmail com>
+
+	* src/spring-model.c (on_end_move, model_is_calm): Patch from Maik
+	Beckmann to remove compilation warnings.  Fixes #355876.
+
 2006-09-18  Elijah Newren  <newren gmail com>
 
 	* configure.in: Make detection of stable vs. unstable automatic
diff --git a/src/spring-model.c b/src/spring-model.c
index 88534dfae..a1dd44639 100644
--- a/src/spring-model.c
+++ b/src/spring-model.c
@@ -362,23 +362,12 @@ model_update_move (Model *model, int x, int y)
   model->anchor_object->position.y = y - model->anchor_offset.y;
 }
 
-static void
-on_end_move (Model	 *model)
-{
-  if (model->anchor_object)
-  {
-      model->anchor_object->immobile = 0;
-      model->anchor_object = NULL;
-  }
-}
-
 #define EPSILON   0.02
 
 gboolean
 model_is_calm (Model *model)
 {
-    int i, j;
-    gboolean calm = TRUE;
+    int i;
 
     for (i = 0; i < model->num_objects; i++)
     {