diff --git a/lyx.changes b/lyx.changes
index 0ed584c..262b979 100644
--- a/lyx.changes
+++ b/lyx.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 29 15:30:26 CEST 2008 - dmueller@suse.de
+
+- add upstream fix for qt 4.4 crash on startup
+
 -------------------------------------------------------------------
 Fri Mar  7 14:01:54 CET 2008 - dmueller@suse.de
 
diff --git a/lyx.spec b/lyx.spec
index c22f8b9..1f6f3a6 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -24,7 +24,7 @@ Group:          Productivity/Publishing/TeX/Frontends
 Requires:       texlive-latex ImageMagick free-ttf-fonts
 AutoReqProv:    on
 Version:        1.5.4
-Release:        1
+Release:        17
 Summary:        LaTeX-Based WYSIWYG Editor
 Url:            http://www.lyx.org/
 Source:         lyx-%{version}.tar.bz2
@@ -32,6 +32,7 @@ Source1:        lyx.desktop
 Source2:        lyx.png
 Patch:          strict-aliasing-punning.diff
 Patch1:         lyx-1.5.3.diff
+Patch2:         r24324.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -51,6 +52,7 @@ Authors:
 %setup -q -n %{name}-%{version}
 %patch
 %patch1
+%patch2
 
 %build
 %{?suse_update_config:%{suse_update_config -f config}}
@@ -107,6 +109,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man1/tex2lyx.1.gz
 
 %changelog
+* Tue Apr 29 2008 dmueller@suse.de
+- add upstream fix for qt 4.4 crash on startup
 * Fri Mar 07 2008 dmueller@suse.de
 - update to 1.5.4:
   * for a changelog, see http://www.lyx.org/announce/1_5_4.txt
diff --git a/r24324.diff b/r24324.diff
new file mode 100644
index 0000000..b8bed11
--- /dev/null
+++ b/r24324.diff
@@ -0,0 +1,13 @@
+--- src/frontends/WorkArea.cpp
++++ src/frontends/WorkArea.cpp
+@@ -244,10 +244,5 @@
+ void WorkArea::resizeBufferView()
+ {
+-	lyx_view_.busy(true);
+-	lyx_view_.message(_("Formatting document..."));
+ 	buffer_view_->workAreaResize(width(), height());
+-	lyx_view_.updateLayoutChoice();
+-	lyx_view_.clearMessage();
+-	lyx_view_.busy(false);
+ }
+