--- rxvt-unicode/src/command.C	2012/06/07 11:27:08	1.519
+++ rxvt-unicode/src/command.C	2012/06/10 16:00:26	1.521
@@ -1493,10 +1493,10 @@
                     parent_x = x;
                     parent_y = y;
                     HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
+                    moved = true;
                   }
 
-                if (bg_set_position (x, y)
-                    || !(bg_flags & BG_IS_VALID))
+                if (!(bg_flags & BG_IS_VALID))
                   moved = true;
               }
 
@@ -3490,7 +3490,7 @@
 
             if (*str != ';')
               {
-                if (fimage.set_file_geometry (str))
+                if (fimage.set_file_geometry (this, str))
                   changed = true;
               }
             else
@@ -3506,7 +3506,8 @@
                   {
                     int x, y;
                     get_window_origin (x, y);
-                    bg_set_position (x, y);
+                    parent_x = x;
+                    parent_y = y;
                   }
                 update_background ();
               }