diff --git a/ChangeLog b/ChangeLog
index e269a2e3f..dc206f953 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-02-06  Elijah Newren  <newren@gmail.com>
+
+	Set a _METACITY_VERSION property (a utf8 string) on the WM check
+	window.  #165350.
+
+	* src/display.h: (struct MetaDisplay): add a atom_metacity_version
+	field
+	
+	* src/display.c: (meta_display_open): initialize the
+	_METACITY_VERSION property on the WM check window to the current
+	version of Metacity.
+
 2005-02-06  Elijah Newren  <newren@gmail.com>
 
 	Ignore xconfigurerequest events for stacking when it should be
@@ -9,7 +21,7 @@
 	active_window is from a separate application than the one getting
 	the configure request and the net_wm_user_time of the active
 	window is later than that of the window getting the configure
-	request, then ignore the request.  
+	request, then ignore the request.
 
 2005-02-06  Elijah Newren  <newren@gmail.com>
 
diff --git a/src/display.c b/src/display.c
index 444261d42..f72bd599a 100644
--- a/src/display.c
+++ b/src/display.c
@@ -295,7 +295,8 @@ meta_display_open (const char *name)
     "_NET_RESTACK_WINDOW",
     "_NET_MOVERESIZE_WINDOW",
     "_NET_DESKTOP_GEOMETRY",
-    "_NET_DESKTOP_VIEWPORT"
+    "_NET_DESKTOP_VIEWPORT",
+    "_METACITY_VERSION"
   };
   Atom atoms[G_N_ELEMENTS(atom_names)];
   
@@ -449,6 +450,7 @@ meta_display_open (const char *name)
   display->atom_net_moveresize_window = atoms[88];
   display->atom_net_desktop_geometry = atoms[89];
   display->atom_net_desktop_viewport = atoms[90];
+  display->atom_metacity_version = atoms[91];
 
   display->prop_hooks = NULL;
   meta_display_init_window_prop_hooks (display);
@@ -622,6 +624,11 @@ meta_display_open (const char *name)
                           display->atom_net_wm_name,
                           "Metacity");
     
+    set_utf8_string_hint (display,
+                          display->leader_window,
+                          display->atom_metacity_version,
+                          VERSION);
+
     data[0] = display->leader_window;
     XChangeProperty (display->xdisplay,
                      display->leader_window,
diff --git a/src/display.h b/src/display.h
index 6fd41c586..07070342c 100644
--- a/src/display.h
+++ b/src/display.h
@@ -182,6 +182,7 @@ struct _MetaDisplay
   Atom atom_net_moveresize_window;
   Atom atom_net_desktop_geometry;
   Atom atom_net_desktop_viewport;
+  Atom atom_metacity_version;
 
   /* This is the actual window from focus events,
    * not the one we last set