diff --git a/eclipse.spec b/eclipse.spec
index fda73b0..1da84dd 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -23,7 +23,7 @@ ExclusiveArch: i386 x86_64 ppc
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        0.M6.13
+Release:        0.M6.15
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -87,6 +87,8 @@ Patch21: 	%{name}-gnuformatterjdtui.patch
 Patch22: 	%{name}-updatehomedir.patch
 #https://bugs.eclipse.org/bugs/show_bug.cgi?id=82988
 Patch23:	%{name}-importArchivedProj.patch
+#https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155853
+Patch24: 	%{name}-NPE-debug.ui.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  ant
@@ -280,6 +282,9 @@ popd
 pushd plugins/org.eclipse.ui.ide
 %patch23 -p0
 popd
+pushd plugins/org.eclipse.debug.ui
+%patch24 -p0
+popd
 
 %if %{gcj_support}
 # Fedora splash screen.
@@ -1033,7 +1038,10 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
-* Thu Apr 28 2005 Phil Muldoon <pmuldoon@redhat.com> 3.1.0_fc-0.M6.13
+* Sat Apr 30 2005 Ben Konrath <bkonrath@redhat.com> 3.1.0_fc-0.M6.15
+- Add patch to temporarily stop an NPE in debug.ui (rh#155853).
+
+* Thu Apr 28 2005 Phil Muldoon <pmuldoon@redhat.com> 3.1.0_fc-0.M6.14
 - Allow multiple optional arguments in eclipse-copy-platform.sh 
 
 * Wed Apr 27 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M6.13