diff --git a/emacs-22.1-iconic.patch b/emacs-22.1-iconic.patch
new file mode 100644
index 0000000..9e7d4c7
--- /dev/null
+++ b/emacs-22.1-iconic.patch
@@ -0,0 +1,12 @@
+--- lisp/startup.el
++++ lisp/startup.el	2007-12-20 12:10:27.169138433 +0100
+@@ -1829,6 +1829,9 @@ With a prefix argument, any user input h
+                 ((equal argi "-no-splash")
+                  (setq inhibit-startup-message t))
+ 
++                ((equal argi "-iconic")
++                 (setq inhibit-startup-message t))
++
+                 ((member argi '("-f"	; what the manual claims
+                                 "-funcall"
+                                 "-e"))  ; what the source used to say
diff --git a/emacs.changes b/emacs.changes
index 9f6d192..4989c33 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 20 12:13:23 CET 2007 - werner@suse.de
+
+- Suppress startup message in case of starting iconic (bug #342385)
+
 -------------------------------------------------------------------
 Tue Dec 18 17:29:57 CET 2007 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index a8cd033..5f2342d 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -20,7 +20,7 @@ Requires:       emacs-info ctags emacs_program
 Provides:       ge_site ge_exec emacs-url Mule-UCS emacs-calc erc
 AutoReqProv:    on
 Version:        22.1
-Release:        69
+Release:        70
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        GNU Emacs Base Package
 Source:         emacs-22.1.tar.bz2
@@ -46,6 +46,7 @@ Patch13:        emacs-22.0.99-s390x.dif
 Patch14:        emacs-22.1-conf.diff
 Patch15:        emacs-22.1-CVE-2007-5795.dif
 Patch16:        emacs-22.1-format.diff
+Patch17:        emacs-22.1-iconic.patch
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
 %if "%_exec_prefix" == "/usr/X11R6"
 %define _x11lib     %{_exec_prefix}/%{_lib}
@@ -213,9 +214,10 @@ Authors:
 %patch11 -p0 -b .xim
 %patch12 -p0 -b .x11r7
 %patch13 -p0 -b .s390x
-%patch14
+%patch14 -p0 -b .conf
 %patch15 -p0 -b .CVE20075795
-%patch16
+%patch16 -p0 -b .format
+%patch17 -p0 -b .iconic
 %patch
 if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
     install-mh -auto < /dev/null
@@ -418,6 +420,7 @@ rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/loaddefs.el.psbdf
 rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/ps-bdf.el.psbdf
 rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/ps-mule.el.print
 rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/ps-mule.el.mule
+rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/startup.el.iconic
 rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/textmodes/ispell.el.mule
 rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/term.el.term
 rm -vf %{buildroot}/usr/share/emacs/%{version}/etc/ctags.1
@@ -3241,6 +3244,8 @@ done
 /usr/share/emacs/%{version}/lisp/xt-mouse.el.gz
 
 %changelog
+* Thu Dec 20 2007 - werner@suse.de
+- Suppress startup message in case of starting iconic (bug #342385)
 * Tue Dec 18 2007 - werner@suse.de
 - Add workaround for conflict between GTK/GDK and KWin by using
   Athena/Xaw3d toolkit in case of running within a KDE session.