diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2371c6f7c8..d2bfdb90a40 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* info.el (Info-find-file): Fall back on the installation
+	directory if we can't find the info node anywhere else.
+
 2011-07-13  Sergei Organov  <osv@javad.com>  (tiny change)
 
 	* vc/vc.el (vc-revert-file):
diff --git a/lisp/info.el b/lisp/info.el
index 29daac566d1..9e67542cda5 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -728,6 +728,11 @@ just return nil (no error)."
 			  (append Info-directory-list
 				  Info-additional-directory-list)
 			Info-directory-list)))))
+	;; Fall back on the installation directory if we can't find
+	;; the info node anywhere else.
+	(when installation-directory
+	  (setq dirs (append dirs (list (expand-file-name
+					 "info" installation-directory)))))
 	;; Search the directory list for file FILENAME.
 	(while (and dirs (not found))
 	  (setq temp (expand-file-name filename (car dirs)))