diff --git a/src/ChangeLog b/src/ChangeLog
index 00a82cc1407..a3116af3f89 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-19  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xterm.c (x_set_offset): Take window manager decorations
+	into account.
+
 2003-09-19  Richard M. Stallman  <rms@gnu.org>
 
 	* atimer.h: Don't include lisp.h.
diff --git a/src/xterm.c b/src/xterm.c
index 3874f3db82f..3300f6b505d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8314,12 +8314,15 @@ x_set_offset (f, xoff, yoff, change_gravity)
       f->win_gravity = NorthWestGravity;
     }
   x_calc_absolute_position (f);
-
+ 
   BLOCK_INPUT;
   x_wm_set_size_hint (f, (long) 0, 0);
 
   modified_left = f->left_pos;
   modified_top = f->top_pos;
+  modified_left += FRAME_X_OUTPUT (f)->x_pixels_outer_diff;
+  modified_top += FRAME_X_OUTPUT (f)->y_pixels_outer_diff;
+
 #if 0 /* Running on psilocin (Debian), and displaying on the NCD X-terminal,
 	 this seems to be unnecessary and incorrect.  rms, 4/17/97.  */
   /* It is a mystery why we need to add the border_width here