diff --git a/ChangeLog b/ChangeLog
index 52302c7..3767a0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3954,3 +3954,9 @@ Thu Nov  9 20:14:34 PST 2000	Michael Jennings <mej@eterm.org>
 	fixed.  Many thanks for his assistance.
 	
 -------------------------------------------------------------------------------
+Sun Nov 12 12:05:58 PST 2000	Michael Jennings <mej@eterm.org>
+
+	Check for _MOTIF_WM_INFO instead of _MOTIF_WM_HINTS to see if the WM
+	can handle MWM hints.  This is all raster's fault.
+	
+-------------------------------------------------------------------------------
diff --git a/src/windows.c b/src/windows.c
index 21a14ae..14cb8d5 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -317,7 +317,7 @@ Create_Windows(int argc, char *argv[])
   MWMHints mwmhints;
 
   if (Options & Opt_borderless) {
-    prop = XInternAtom(Xdisplay, "_MOTIF_WM_HINTS", True);
+    prop = XInternAtom(Xdisplay, "_MOTIF_WM_INFO", True);
     if (prop == None) {
       print_warning("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");
       Attributes.override_redirect = TRUE;
@@ -398,6 +398,7 @@ Create_Windows(int argc, char *argv[])
   XSelectInput(Xdisplay, Xroot, PropertyChangeMask);
   XSelectInput(Xdisplay, TermWin.parent, (KeyPressMask | FocusChangeMask | StructureNotifyMask | VisibilityChangeMask | PropertyChangeMask));
   if (mwmhints.flags) {
+    prop = XInternAtom(Xdisplay, "_MOTIF_WM_HINTS", False);
     XChangeProperty(Xdisplay, TermWin.parent, prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
   }
   /* vt cursor: Black-on-White is standard, but this is more popular */