diff --git a/defaults/defaults b/defaults/defaults
index f2b3c57426116f68d91845f095ee4a41faa2a5ab..b8df733ef6d1a7820fede73c3d06197151bb3f56 100644
--- a/defaults/defaults
+++ b/defaults/defaults
@@ -31,7 +31,7 @@ shadow_delta_x=0
 shadow_delta_y=0
 snap_to_border=true
 snap_to_windows=false
-snap_resist=true
+snap_resist=false
 snap_width=10
 theme=Default
 title_alignment=left
diff --git a/mcs-plugin/wmtweaks_plugin.c b/mcs-plugin/wmtweaks_plugin.c
index 990eefb4eb87935698220cdf88e1f92aba9228a5..3fd89556390e31fb72331244c6d69054ef2b93b4 100644
--- a/mcs-plugin/wmtweaks_plugin.c
+++ b/mcs-plugin/wmtweaks_plugin.c
@@ -66,7 +66,7 @@ static gboolean prevent_focus_stealing = FALSE;
 static gboolean raise_with_any_button  = FALSE;
 static gboolean restore_on_move        = TRUE;
 static gboolean scroll_workspaces      = TRUE;
-static gboolean snap_resist            = TRUE;
+static gboolean snap_resist            = FALSE;
 static gboolean toggle_workspaces      = TRUE;
 static gboolean wrap_layout            = FALSE;
 static gboolean wrap_cycle             = FALSE;
diff --git a/mcs-plugin/workspaces.c b/mcs-plugin/workspaces.c
index 4a23c48662b246c1f0b6649fb8a9127dff83a325..b374332747b2e8cdc59adcba031ff265db2bad9b 100644
--- a/mcs-plugin/workspaces.c
+++ b/mcs-plugin/workspaces.c
@@ -1,4 +1,4 @@
-/*      $Id$
+/*      $Id: workspaces.c 19935 2006-02-18 08:21:05Z olivier $
  
         This program is free software; you can redistribute it and/or modify
         it under the terms of the GNU General Public License as published by
diff --git a/mcs-plugin/xfwm4_plugin.c b/mcs-plugin/xfwm4_plugin.c
index 3006675164734be3b5dd773a6694872b62422c5b..a157fec98cf200a2236abae968626693dc12c471 100644
--- a/mcs-plugin/xfwm4_plugin.c
+++ b/mcs-plugin/xfwm4_plugin.c
@@ -1,4 +1,4 @@
-/*      $Id$
+/*      $Id: xfwm4_plugin.c 20089 2006-02-26 16:02:48Z olivier $
  
         This program is free software; you can redistribute it and/or modify
         it under the terms of the GNU General Public License as published by
diff --git a/mcs-plugin/xfwm4_shortcuteditor.c b/mcs-plugin/xfwm4_shortcuteditor.c
index cdd9184b6f68ff9793352cc2c1e996fea0526a7a..c96953ecb2eac7f3646de690247094738c1f3ee0 100644
--- a/mcs-plugin/xfwm4_shortcuteditor.c
+++ b/mcs-plugin/xfwm4_shortcuteditor.c
@@ -1,4 +1,4 @@
-/*      $Id$
+/*      $Id: xfwm4_shortcuteditor.c 19935 2006-02-18 08:21:05Z olivier $
  
         This program is free software; you can redistribute it and/or modify
         it under the terms of the GNU General Public License as published by