diff --git a/emacs.changes b/emacs.changes
index ae0bdc8..e054548 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue May 22 16:55:20 CEST 2007 - schwab@suse.de
+
+- Add alsa-devel to BuildRequires.
+- Obsolete emacs-url Mule-UCS emacs-calc erc elispman elisp-manual
+  elispint emacs-lisp-intro.
+- Update list of info files.
+
 -------------------------------------------------------------------
 Tue May 22 13:17:30 CEST 2007 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 1c90a03..2637dbc 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -11,16 +11,16 @@
 # norootforbuild
 
 Name:           emacs
-BuildRequires:  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 xorg-x11-devel
+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 xorg-x11-devel
 URL:            http://www.gnu.org/software/emacs/
 License:        GNU General Public License (GPL)
 Group:          Productivity/Editors/Emacs
-Obsoletes:      ge_exec ge_site emac_nox emacmisc emacsbin emacsger 
+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
+Provides:       ge_site ge_exec emacs-url Mule-UCS emacs-calc erc
 Autoreqprov:    on
 Version:        22.0.99
-Release:        1
+Release:        2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        GNU Emacs Base Package
 Source:         emacs-22.0.99.tar.bz2
@@ -166,7 +166,8 @@ Authors:
     Eric S. Raymond <esr@thyrsus.com>
 
 %package     -n emacs-info
-Obsoletes:      ge_info
+Obsoletes:      ge_info elispman elisp-manual elispint emacs-lisp-intro
+Provides:       elispman elisp-manual elispint emacs-lisp-intro
 Summary:        Info files for GNU Emacs
 Group:          Productivity/Editors/Emacs
 PreReq:         %install_info_prereq
@@ -213,10 +214,14 @@ if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
 fi
 
 %build
+%define info_files eintr elisp emacs ccmode cl dired-x ediff forms gnus message sieve pgg emacs-mime info mh-e reftex sc vip viper widget efaq ada-mode autotype calc idlwave eudc ebrowse pcl-cvs woman eshell org url speedbar tramp ses smtpmail flymake newsticker rcirc erc
+if test "eintr elisp $(perl -e 'while (<>) { if (/^INFO_TARGETS/) { s/.*=//; while (s/\\$//) { $_ .= <>; }; s,\.\./info/,,g; s/\s+/ /g; s/^ //; s/ $//; print; exit; } }' man/Makefile.in)" != "%info_files"; then
+  echo Please update info_files >&2
+  exit 1
+fi
 VERSION=%{version}
     SYS="--host=%{_host_cpu}-suse-%{_host_os}
 	 --build=%{_build_cpu}-suse-%{_build_os}
-	 --target=%{_target_cpu}-suse-%{_target_os}
 "
  CFLAGS="${RPM_OPT_FLAGS} -pipe -fno-strict-aliasing \
 	 -D_GNU_SOURCE \
@@ -403,7 +408,6 @@ test -L usr/bin/emacs && rm -f usr/bin/emacs || true
 
 %postun -n emacs-x11
 test -e usr/bin/emacs-nox -a ! -e usr/bin/emacs && ln -sf emacs-nox usr/bin/emacs || true
-%define info_files ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman
 
 %post info
 for f in %info_files; do
@@ -3160,6 +3164,11 @@ done
 /usr/share/emacs/%{version}/lisp/xt-mouse.el.gz
 
 %changelog
+* Tue May 22 2007 - schwab@suse.de
+- Add alsa-devel to BuildRequires.
+- Obsolete emacs-url Mule-UCS emacs-calc erc elispman elisp-manual
+  elispint emacs-lisp-intro.
+- Update list of info files.
 * Tue May 22 2007 - werner@suse.de
 - Switch over to emacs 22.0.99 which used UFT-8 native
 - Adopt the patches if not already applied