diff --git a/diffutils-sdiff.patch b/diffutils-sdiff.patch
new file mode 100644
index 0000000..ce862f1
--- /dev/null
+++ b/diffutils-sdiff.patch
@@ -0,0 +1,12 @@
+--- diffutils-2.8.1/src/sdiff.c.sdiff	2005-04-06 14:59:26.000000000 +0100
++++ diffutils-2.8.1/src/sdiff.c	2005-04-06 15:02:36.000000000 +0100
+@@ -724,7 +724,8 @@
+ 	if (! interact_ok)
+ 	  exiterr ();
+ 
+-	ck_editor_status (werrno, wstatus);
++	if (!WIFEXITED(wstatus))
++	  ck_editor_status (werrno, wstatus);
+ 	untrapsig (0);
+ 	checksigs ();
+ 	exit (WEXITSTATUS (wstatus));
diff --git a/diffutils.spec b/diffutils.spec
index e3f95b5..08a3016 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -11,6 +11,7 @@ Source3: diff3.1
 Source4: sdiff.1
 Patch0: diffutils-2.8.4-i18n.patch
 Patch1: diffutils-2.8.1-badc.patch
+Patch2: diffutils-sdiff.patch
 License: GPL
 Prefix: %{_prefix}
 Prereq: /sbin/install-info
@@ -33,6 +34,7 @@ Install diffutils if you need to compare text files.
 %setup -q
 %patch0 -p1 -b .i18n
 %patch1 -p1 -b .badc
+%patch2 -p1 -b .sdiff
 
 %build
 %configure
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/diff.info*gz
 
 %changelog
+* Wed Apr  6 2005 Tim Waugh <twaugh@redhat.com>
+- Fixed sdiff exit code handling (bug #152967).
+
 * Wed Mar  2 2005 Tim Waugh <twaugh@redhat.com> 2.8.1-14
 - Rebuild for new GCC.