diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a9e6a15c..32da46b6f 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-01-09  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-compat.el (org-fit-window-to-buffer): Use
+	`window-full-width-p'.
+
 	* org-export-latex.el (org-export-latex-fixed-width): Enforce the
 	space after the colon in short examples.
 
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 13ab3688a..831b435fd 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -157,7 +157,9 @@ WINDOW defaults to the selected window.  MAX-HEIGHT and MIN-HEIGHT are
 passed through to `fit-window-to-buffer'.  If SHRINK-ONLY is set, call
 `shrink-window-if-larger-than-buffer' instead, the hight limit are
 ignored in this case."
-  (cond ((> (frame-width) (window-width window))
+  (cond ((if (fboundp 'window-full-width-p)
+	     (window-full-width-p window)
+	   (> (frame-width) (window-width window)))
 	 ;; do nothing if another window would suffer
 	 )
 	((and (fboundp 'fit-window-to-buffer) (not shrink-only))