diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58f562be79d..8d8f3e0f6ca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2005-08-11  Richard M. Stallman  <rms@gnu.org>
+
+	* battery.el (battery-status-function): Don't use ignore-errors.
+
+2005-08-11  Lute Kamstra  <lute@gnu.org>
+
+	* emacs-lisp/generic.el (generic-font-lock-defaults): Declare with
+	define-obsolete-variable-alias.
+
 2005-08-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* net/ange-ftp.el: Use \\` and \\' instead of ^ and $ in regexps.
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index c140fe4c47d..3b423f20d88 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -102,8 +102,7 @@
 (defvar generic-font-lock-keywords nil
   "Keywords for `font-lock-defaults' in a generic mode.")
 (make-variable-buffer-local 'generic-font-lock-keywords)
-(defvaralias 'generic-font-lock-defaults 'generic-font-lock-keywords)
-(make-obsolete-variable 'generic-font-lock-defaults 'generic-font-lock-keywords "22.1")
+(define-obsolete-variable-alias 'generic-font-lock-defaults 'generic-font-lock-keywords "22.1")
 
 ;;;###autoload
 (defvar generic-mode-list nil