diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 998be8dbd..9504c286e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-02  Christopher Faylor  <me.cygwin2012@cgf.cx>
+
+	* exceptions.cc (exception::handle): Use error_code in klog, as
+	intended.  Found by Clang.
+
 2012-07-02  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler.h (class fhandler_dev_clipboard): Remove member eof.
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 833fa4f42..332a40610 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -676,8 +676,7 @@ exception::handle (EXCEPTION_RECORD *e, exception_list *frame, CONTEXT *in, void
 	  klog (LOG_INFO, "%s[%d]: segfault at %08x rip %08x rsp %08x error %d",
 			  __progname, myself->pid,
 			  e->ExceptionInformation[1], in->Eip, in->Esp,
-			  ((in->Eip >= 0x61000000 && in->Eip < 0x61200000)
-			   ? 0 : 4) | (e->ExceptionInformation[0] << 1));
+			  error_code);
 	}
 
       /* Flag signal + core dump */