diff --git a/default.el b/default.el
index 1e87f10..59b26f6 100644
--- a/default.el
+++ b/default.el
@@ -4,9 +4,6 @@
 ;;; prevents loading of this file.  Also the "-q" option to emacs
 ;;; prevents both "~/.emacs" and this file from being loaded at startup.
 
-;; always end a file with a newline
-(setq require-final-newline 'query)
-
 (when window-system
   ;; enable wheelmouse support by default
   (mwheel-install)
diff --git a/dotemacs.el b/dotemacs.el
index ec5adcb..986cfcf 100644
--- a/dotemacs.el
+++ b/dotemacs.el
@@ -16,3 +16,7 @@
 
 ;; default to unified diffs
 (setq diff-switches "-u")
+
+;; always end a file with a newline
+;(setq require-final-newline 'query)
+
diff --git a/emacs.spec b/emacs.spec
index b9cc1d7..8cca55d 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -420,6 +420,10 @@ fi
 %defattr(-,root,root)
 
 %changelog
+* Mon May 30 2005 Jens Petersen <petersen@redhat.com>
+- move setting of require-final-newline from default.el to a comment in default
+  .emacs (Ralph Loader, 119141)
+
 * Wed May 18 2005 Jens Petersen <petersen@redhat.com> - 21.4-5
 - update cc-mode to 5.30.9 stable release to address font-lock problems
   (126165,148977,150197,155292,158044)