diff --git a/ChangeLog b/ChangeLog
index 89c39915b..b6bd36f90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-08  Rob Adams <robadams@ucla.edu>
+
+	* src/window-props.c (reload_normal_hints):  Check that window min
+	and max size hints are at least 1.  Fix for #107110.
+
 2003-02-27  Havoc Pennington  <hp@pobox.com>
 
 	Changes made on plane from FOSDEM, syncing from laptop.
diff --git a/src/window-props.c b/src/window-props.c
index 1e334be16..03d860878 100644
--- a/src/window-props.c
+++ b/src/window-props.c
@@ -620,6 +620,39 @@ reload_normal_hints (MetaWindow    *window,
                       window->size_hints.min_height);
           window->size_hints.max_height = window->size_hints.min_height;
         }
+
+      if (window->size_hints.min_width < 1)
+        {
+          /* another cracksmoker */
+          meta_topic (META_DEBUG_GEOMETRY,
+                      "Window %s sets min width to 0, which makes no sense\n",
+                      window->desc);
+          window->size_hints.min_width = 1;
+        }
+      if (window->size_hints.max_width < 1)
+        {
+          /* another cracksmoker */
+          meta_topic (META_DEBUG_GEOMETRY,
+                      "Window %s sets max width to 0, which makes no sense\n",
+                      window->desc);
+          window->size_hints.max_width = 1;
+        }
+      if (window->size_hints.min_height < 1)
+        {
+          /* another cracksmoker */
+          meta_topic (META_DEBUG_GEOMETRY,
+                      "Window %s sets min height to 0, which makes no sense\n",
+                      window->desc);
+          window->size_hints.min_height = 1;
+        }
+      if (window->size_hints.max_height < 1)
+        {
+          /* another cracksmoker */
+          meta_topic (META_DEBUG_GEOMETRY,
+                      "Window %s sets max height to 0, which makes no sense\n",
+                      window->desc);
+          window->size_hints.max_height = 1;
+        }
   
       if (window->size_hints.flags & PResizeInc)
         {