diff --git a/ChangeLog b/ChangeLog
index a4ba0bde4..c3ae57eae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-03  Elijah Newren  <newren@gmail.com>
+
+	Patch from Björn Lindqvist to have ancestors come along with the
+	transient when moving the window from one workspace to another.
+	Fixes #314977.
+
+	* src/window.c (meta_window_change_workspace): have all ancestors
+	change workspaces too
+
 2005-10-03  Elijah Newren  <newren@gmail.com>
 
 	* configure.in: post-release version bump to 2.12.2
diff --git a/src/window.c b/src/window.c
index c6b67690a..fb2ec9c35 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3628,6 +3628,8 @@ meta_window_change_workspace (MetaWindow    *window,
 
   meta_window_foreach_transient (window, change_workspace_foreach,
                                  workspace);
+  meta_window_foreach_ancestor (window, change_workspace_foreach,
+                                workspace);
 }
 
 static void