diff --git a/ChangeLog b/ChangeLog
index bc1d26079d..073acf85dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-26  Ulrich Drepper  <drepper@cygnus.com>
 
+	* sysdeps/unix/sysv/linux/i386/clone.S: When not using PIC don't
+	use jecxz since the label might be far away.
+
 	* sysdeps/unix/sysv/linux/sigaction.c: Update comment to say the
 	__libc_missing_rt_sigs is defined here.
 	* sysdeps/unix/sysv/linux/sigpending.c: Only declare
diff --git a/sysdeps/unix/sysv/linux/i386/clone.S b/sysdeps/unix/sysv/linux/i386/clone.S
index 9b0284b661..7a2025b53c 100644
--- a/sysdeps/unix/sysv/linux/i386/clone.S
+++ b/sysdeps/unix/sysv/linux/i386/clone.S
@@ -32,9 +32,19 @@ ENTRY(__clone)
 	/* Sanity check arguments.  */
 	movl	$-EINVAL,%eax
 	movl	4(%esp),%ecx		/* no NULL function pointers */
+#ifdef PIC
 	jecxz	SYSCALL_ERROR_LABEL
+#else
+	testl	%ecx,%ecx
+	jz	SYSCALL_ERROR_LABEL
+#endif
 	movl	8(%esp),%ecx		/* no NULL stack pointers */
+#ifdef PIC
 	jecxz	SYSCALL_ERROR_LABEL
+#else
+	testl	%ecx,%ecx
+	jz	SYSCALL_ERROR_LABEL
+#endif
 
 	/* Insert the argument onto the new stack.  */
 	subl	$8,%ecx