diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 722184d512d..87b5a0885d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-08  Eli Zaretskii  <eliz@gnu.org>
+
+	* org/org-jsinfo.el: Renamed from org-infojs.el, to avoid
+	file-names clashes on 8+3 filesystems.
+
 2008-05-08  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org/org.el (org-read-date-get-relative): Interpret lone
diff --git a/lisp/org/org-infojs.el b/lisp/org/org-jsinfo.el
similarity index 99%
rename from lisp/org/org-infojs.el
rename to lisp/org/org-jsinfo.el
index f1b11b7c95d..efbd3f4bb9f 100644
--- a/lisp/org/org-infojs.el
+++ b/lisp/org/org-jsinfo.el
@@ -1,4 +1,4 @@
-;;; org-infojs.el --- Support for org-info.js Javascript in Org HTML export
+;;; org-jsinfo.el --- Support for org-info.js Javascript in Org HTML export
 
 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.