diff --git a/emacs-22.0.99.dif b/emacs-22.0.99.dif
index 0ca3173..1de2542 100644
--- a/emacs-22.0.99.dif
+++ b/emacs-22.0.99.dif
@@ -1185,129 +1185,6 @@
 +;;
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;; Ende von locale.el
---- site-lisp/term/xterm.el
-+++ site-lisp/term/xterm.el	2003-07-23 18:08:56.000000000 +0200
-@@ -0,0 +1,120 @@
-+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-+;;; term/xterm.el for site-lisp path
-+;;; Copyright (c) 1996 SuSE Gmbh Nuernberg, Germany.  All rights reserved.
-+;;;
-+;;; Author: Werner Fink  <werner@suse.de>, No warranty of any kind
-+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-+;; MF-102: on linux console \033[1~ is not [find] but [home]
-+;; in xterm [home] is \033[H (app-keypad off) or \033OH (app-keypad on)
-+;; and [find] is \033[1~
-+;; Note: this must be consistent with app-defaults of xterm,
-+;;       terminfo/termcap, and all of inputrc, csh.cshrc, exrc
-+  (define-key function-key-map "\e[1~" [find])
-+  (define-key function-key-map "\e[H"  [home])
-+  (define-key function-key-map "\eOH"  [home])
-+  (define-key function-key-map "\e[2~" [insertchar])
-+  (define-key function-key-map "\e[3~" [deletechar])
-+;; MF-102: on linux console \033[4~ is not [select] but [end]
-+;; in xterm [end] should be \033[F (app-keypad off) or \033OF (app-keypad on)
-+;; and [select] is \033[4~
-+;; Note: this must be consistent with app-defaults of xterm,
-+;;       terminfo/termcap, and all of inputrc, csh.cshrc, exrc
-+  (define-key function-key-map "\e[4~" [select])
-+  (define-key function-key-map "\e[F"  [end])
-+  (define-key function-key-map "\eOF"  [end])
-+  (define-key function-key-map "\e[5~" [prior])
-+  (define-key function-key-map "\e[6~" [next])
-+  (define-key function-key-map "\e[11~" [f1])
-+  (define-key function-key-map "\e[12~" [f2])
-+  (define-key function-key-map "\e[13~" [f3])
-+  (define-key function-key-map "\e[14~" [f4])
-+  (define-key function-key-map "\eOP"   [f1])
-+  (define-key function-key-map "\eOQ"   [f2])
-+  (define-key function-key-map "\eOR"   [f3])
-+  (define-key function-key-map "\eOS"   [f4])
-+  (define-key function-key-map "\e[15~" [f5])
-+  (define-key function-key-map "\e[17~" [f6])
-+  (define-key function-key-map "\e[18~" [f7])
-+  (define-key function-key-map "\e[19~" [f8])
-+  (define-key function-key-map "\e[20~" [f9])
-+  (define-key function-key-map "\e[21~" [f10])
-+  (define-key function-key-map "\e[23~" [f11])
-+  (define-key function-key-map "\e[24~" [f12])
-+  (define-key function-key-map "\e[25~" [f13])
-+  (define-key function-key-map "\e[26~" [f14])
-+  (define-key function-key-map "\e[28~" [help])
-+  (define-key function-key-map "\e[29~" [menu])
-+  (define-key function-key-map "\e?\e[28~" [M-help])
-+  (define-key function-key-map "\e?\e[29~" [M-menu])
-+  (define-key function-key-map "\e[31~" [f17])
-+  (define-key function-key-map "\e[32~" [f18])
-+  (define-key function-key-map "\e[33~" [f19])
-+  (define-key function-key-map "\e[34~" [f20])
-+;;
-+;; num block
-+;; [home] and [end] found in num block
-+  (define-key function-key-map "\eOH" [home])
-+  (define-key function-key-map "\eOF" [end])
-+  (define-key function-key-map "\eOE" [begin])
-+;;
-+;; Locked num block
-+;; kp_f1 .. kp_f4 and kp_tab not found on MF-102
-+;; For xterm on xfree we use f1 .. f4, see above
-+; (define-key function-key-map "\eOP" [kp-f1])
-+; (define-key function-key-map "\eOQ" [kp-f2])
-+; (define-key function-key-map "\eOR" [kp-f3])
-+; (define-key function-key-map "\eOS" [kp-f4])
-+  (define-key function-key-map "\eOI" [kp-tab])
-+  (define-key function-key-map "\eOj" [kp-multiply])
-+  (define-key function-key-map "\eOk" [kp-add])
-+  (define-key function-key-map "\eOl" [kp-separator])
-+  (define-key function-key-map "\eOM" [kp-enter])
-+  (define-key function-key-map "\eOm" [kp-subtract])
-+  (define-key function-key-map "\eOn" [kp-decimal])
-+; (define-key function-key-map "\eOn" [kp-period]) ; [kp-decimal]
-+  (define-key function-key-map "\eOo" [kp-divide])
-+  (define-key function-key-map "\eOp" [kp-0])
-+  (define-key function-key-map "\eOq" [kp-1])
-+  (define-key function-key-map "\eOr" [kp-2])
-+  (define-key function-key-map "\eOs" [kp-3])
-+  (define-key function-key-map "\eOt" [kp-4])
-+  (define-key function-key-map "\eOu" [kp-5])
-+  (define-key function-key-map "\eOv" [kp-6])
-+  (define-key function-key-map "\eOw" [kp-7])
-+  (define-key function-key-map "\eOx" [kp-8])
-+  (define-key function-key-map "\eOy" [kp-9])
-+;;
-+;; Undefine some ESC ESC behavior --- for later use
-+  (global-unset-key "\e\e")
-+  (define-key esc-map "\e" nil)
-+;;
-+  (define-key function-key-map  "\eOD" [left])
-+  (define-key function-key-map  "\eOC" [right])
-+  (define-key function-key-map  "\eOA" [up])
-+  (define-key function-key-map  "\eOB" [down])
-+;;
-+  (define-key function-key-map  "\e\eOD" [M-left])
-+  (define-key function-key-map  "\e\eOC" [M-right])
-+  (define-key function-key-map  "\e\eOA" [M-up])
-+  (define-key function-key-map  "\e\eOB" [M-down])
-+;;
-+;; Not in Use?
-+  (define-key function-key-map "\C-?\eOD" [C-left])
-+  (define-key function-key-map "\C-?\eOC" [C-right])
-+  (define-key function-key-map "\C-?\eOA" [C-up])
-+  (define-key function-key-map "\C-?\eOB" [C-down])
-+  (define-key function-key-map "\eO5D"    [C-left])
-+  (define-key function-key-map "\eO5C"    [C-right])
-+  (define-key function-key-map "\eO5A"    [C-up])
-+  (define-key function-key-map "\eO5B"    [C-down])
-+;;
-+;; Backspace, Delete and any thing else
-+;;
-+  (global-unset-key [insertchar])
-+  (global-set-key   [insertchar]  'overwrite-mode)
-+  (global-unset-key [deletechar])
-+  (global-set-key   [deletechar]  'delete-char)
-+;;
-+(load "term/func-keys"  nil t)
-+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-+;; Ende von xterm.el
 --- src/Makefile.in
 +++ src/Makefile.in	2007-05-15 19:19:55.029819000 +0200
 @@ -710,6 +710,9 @@ otherobj= $(termcapobj) lastfile.o $(mal
diff --git a/emacs.changes b/emacs.changes
index 184b75d..2653be6 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep  7 20:44:25 CEST 2007 - schwab@suse.de
+
+- Remove obsolete xterm.el.
+
 -------------------------------------------------------------------
 Mon Jul 23 11:55:15 CEST 2007 - aj@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 826c39e..197a494 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -12,15 +12,15 @@
 
 Name:           emacs
 BuildRequires:  alsa-devel bind-devel fonts-config giflib-devel gtk2-devel krb5-devel libjpeg-devel libpng-devel libtiff-devel ncurses-devel nmh sendmail texinfo update-desktop-files xaw3d-devel xorg-x11-devel
-URL:            http://www.gnu.org/software/emacs/
+Url:            http://www.gnu.org/software/emacs/
 License:        GPL v2 or later
 Group:          Productivity/Editors/Emacs
 Obsoletes:      ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc
 Requires:       emacs-info ctags emacs_program
 Provides:       ge_site ge_exec emacs-url Mule-UCS emacs-calc erc
-Autoreqprov:    on
+AutoReqProv:    on
 Version:        22.1
-Release:        16
+Release:        41
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        GNU Emacs Base Package
 Source:         emacs-22.1.tar.bz2
@@ -85,7 +85,7 @@ Requires:       emacs
 Provides:       emacs_program
 Summary:        GNU Emacs-nox: An Emacs Binary without X Window System Support
 Group:          Productivity/Editors/Emacs
-Autoreqprov:    on
+AutoReqProv:    on
 
 %description -n emacs-nox
 Eight Megabytes And Constantly Swapping. Call it
@@ -117,7 +117,7 @@ Enhances:       xorg-x11-libs
 Provides:       emacs_program emacs:/usr/bin/emacs ge_exec:/usr/bin/emacs
 Summary:        GNU Emacs: Emacs binary with X Window System Support
 Group:          Productivity/Editors/Emacs
-Autoreqprov:    on
+AutoReqProv:    on
 
 %description -n emacs-x11
 Call it
@@ -147,7 +147,7 @@ Obsoletes:      ge_lisp
 Requires:       emacs
 Summary:        Several Lisp Files for GNU Emacs
 Group:          Productivity/Editors/Emacs
-Autoreqprov:    on
+AutoReqProv:    on
 
 %description -n emacs-el
 Several Lisp files not needed for running GNU Emacs. Most of these
@@ -174,7 +174,7 @@ Provides:       elispman elisp-manual elispint emacs-lisp-intro
 Summary:        Info files for GNU Emacs
 Group:          Productivity/Editors/Emacs
 PreReq:         %install_info_prereq
-Autoreqprov:    on
+AutoReqProv:    on
 
 %description -n emacs-info
 This package contains all the Info files for GNU Emacs. These files can
@@ -395,7 +395,6 @@ unelc  %{buildroot}/usr/share/emacs/%{version}/site-lisp/term/gnome.elc
 unelc  %{buildroot}/usr/share/emacs/%{version}/site-lisp/term/kvt.elc
 unelc  %{buildroot}/usr/share/emacs/%{version}/site-lisp/term/linux.elc
 unelc  %{buildroot}/usr/share/emacs/%{version}/site-lisp/term/locale.elc
-unelc  %{buildroot}/usr/share/emacs/%{version}/site-lisp/term/xterm.elc
 unelc  %{buildroot}/usr/share/emacs/site-lisp/site-start.elc
 unelc  %{buildroot}/usr/share/emacs/site-lisp/subdirs.elc
 find %{buildroot}/usr/share/emacs/%{version}/etc/ -name '*[a-z].[16]' | \
@@ -2068,7 +2067,6 @@ done
 /usr/share/emacs/%{version}/site-lisp/term/kvt.el
 /usr/share/emacs/%{version}/site-lisp/term/linux.el
 /usr/share/emacs/%{version}/site-lisp/term/locale.el
-/usr/share/emacs/%{version}/site-lisp/term/xterm.el
 %dir /usr/share/emacs/site-lisp/
 %doc /usr/share/man/man1/emacs.1.gz
 %doc /usr/share/man/man1/emacsclient.1.gz
@@ -3187,8 +3185,9 @@ done
 /usr/share/emacs/%{version}/lisp/x-dnd.el.gz
 /usr/share/emacs/%{version}/lisp/xml.el.gz
 /usr/share/emacs/%{version}/lisp/xt-mouse.el.gz
-
 %changelog
+* Fri Sep 07 2007 - schwab@suse.de
+- Remove obsolete xterm.el.
 * Mon Jul 23 2007 - aj@suse.de
 - Revert last change, it seems that sendmail is somehow used.
 * Sun Jul 22 2007 - aj@suse.de