diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f08d4cfbd..abd0bb7d5 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-28  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-latex.el (org-export-latex-inline-image-extensions): Add ps
+	and eps extensions.
+
 2009-06-27  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-agenda.el (org-write-agenda): Make sure org-icalendar is
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index fbe92705a..7104e4ea0 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -316,12 +316,12 @@ and `org-export-with-tags' instead."
   :type 'string)
 
 (defcustom org-export-latex-inline-image-extensions
-  '("pdf" "jpeg" "jpg" "png")
+  '("pdf" "jpeg" "jpg" "png" "ps" "eps")
   "Extensions of image files that can be inlined into LaTeX.
-Note that this depends on the way the LaTeX file is processed.
-The default setting (pdf and jpg) assumes that pdflatex is doing the
-processing.  If you are using latex and dvips or something similar,
-only postscript files can be included."
+Note that the image extension *actually* allowed depend on the way the
+LaTeX file is processed.  When used with pdflatex, pdf, jpg and png images
+are OK.  When processing through dvi to Postscript, only ps and eps are
+allowed.  The default we use here encompasses both."
   :group 'org-export-latex
   :type '(repeat (string :tag "Extension")))