diff --git a/ChangeLog b/ChangeLog
index ff926740..fae78d5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@ Changes since version 0.91.0:
 - added code to automatically update the icon paths from the old .AppInfo
   style to the new Library/WindowMaker style in WMWindowAttributes when
   Window Maker starts to make transition transparent for users.
+- fixed issue with window being moved by 1 pixel up and left when the window
+  move was initiated by the client
 
 
 Changes since version 0.90.0:
diff --git a/src/client.c b/src/client.c
index f87435ea..14ec9d14 100644
--- a/src/client.c
+++ b/src/client.c
@@ -239,19 +239,23 @@ wClientConfigure(WWindow *wwin, XConfigureRequestEvent *xcre)
         /* If the window is shaded, wrong height will be set for the window */
         if (xcre->value_mask & CWX) {
             nx = xcre->x;
-            if (HAS_BORDER(wwin))
+            /* Subtracting the border makes the window shift by 1 pixel -Dan */
+            /*if (HAS_BORDER(wwin)) {
                 nx -= FRAME_BORDER_WIDTH;
-        }
-        else
+            }*/
+        } else {
             nx = wwin->frame_x;
+        }
 
         if (xcre->value_mask & CWY) {
             ny = xcre->y - ((ofs_y < 0) ? 0 : wwin->frame->top_width);
-            if (HAS_BORDER(wwin))
+            /* Subtracting the border makes the window shift by 1 pixel -Dan */
+            /*if (HAS_BORDER(wwin)) {
                 ny -= FRAME_BORDER_WIDTH;
-        }
-        else
+            }*/
+        } else {
             ny = wwin->frame_y;
+        }
 
         if (xcre->value_mask & CWWidth)
             nwidth = xcre->width;
diff --git a/src/dialog.c b/src/dialog.c
index f99269f5..8205f83f 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1124,7 +1124,8 @@ handleLogoPush(XEvent *event, void *data)
         "WHAT YOU SAY??",
         "SOMEBODY SET UP US THE BOMB",
         "ALL YOUR BASE ARE BELONG TO US!",
-        "Oh My God!!! Larry is back!"
+        "Oh My God!!! Larry is back!",
+        "Alex Perez is aliveeeeeeee!!!"
     };