diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 87a2f035b..ef35a3976 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-11  Christopher Faylor  <cgf@redhat.com>
+
+	* gendef (_sigbe): Zero location on pop.
+	(_cygtls::pop): Ditto.
+
 2004-02-11  Christopher Faylor  <cgf@redhat.com>
 
 	* dcrt0.cc (alloc_stack_hard_way): Eliminate second argument.
diff --git a/winsup/cygwin/gendef b/winsup/cygwin/gendef
index 72afbc1c9..4395ac6de 100755
--- a/winsup/cygwin/gendef
+++ b/winsup/cygwin/gendef
@@ -127,8 +127,7 @@ __sigbe:
 	jmp	1b					#  and loop
 2:	movl	\$-4,%eax				# now decrement aux stack
 	xadd	%eax,$tls::stackptr(%edx)		#  and get pointer
-#	xorl	%ebx,%ebx
-	movl	\$0x41774177,%ebx
+	xorl	%ebx,%ebx
 	xchgl	%ebx,-4(%eax)				# 
 	xchgl	%ebx,8(%esp)
 	decl	$tls::stacklock(%edx)			# release lock
@@ -143,8 +142,7 @@ __ZN7_cygtls3popEv:
 	movl	%eax,%edx
 	movl	\$-4,%ebx
 	xadd	%ebx,$tls::pstackptr(%edx)
-#	xorl	%eax,%eax
-	movl	8(%esp),%eax
+	xorl	%eax,%eax
 	xchgl	%eax,-4(%ebx)
 	popl	%edx				# FIXME: needed?
 	popl	%ebx