diff --git a/ChangeLog b/ChangeLog
index e109ee2375..f43b66b1d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2000-02-13  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/i386/fpu/s_cosf.S: Domain of opcode is not large enough
+	so test for overflow and handle it.
+	* sysdeps/i386/fpu/s_sinf.S: Likewise.
+	* sysdeps/i386/fpu/s_tanf.S: Likewise.
+	Patch by Miloslav Trmac <mitr@volny.cz> (PR libc/1563).
+
 	* iconvdata/Makefile (modules): Add UTF-16.
 	(distribute): Add utf-16.c.
 	* iconvdata/gconv-modules: Add entries for UTF-16, UTF-16BE, and
diff --git a/sysdeps/i386/fpu/s_cosf.S b/sysdeps/i386/fpu/s_cosf.S
index d8e8090639..21f87aa874 100644
--- a/sysdeps/i386/fpu/s_cosf.S
+++ b/sysdeps/i386/fpu/s_cosf.S
@@ -7,10 +7,23 @@
 
 RCSID("$NetBSD: s_cosf.S,v 1.3 1995/05/08 23:55:16 jtc Exp $")
 
-/* A float's domain isn't large enough to require argument reduction. */
 ENTRY(__cosf)
 	flds	4(%esp)
 	fcos
+	fnstsw	%ax
+	testl	$0x400,%eax
+	jnz	1f
+	ret
+	.align ALIGNARG(4)
+1:	fldpi
+	fadd	%st(0)
+	fxch	%st(1)
+2:	fprem1
+	fnstsw	%ax
+	testl	$0x400,%eax
+	jnz	2b
+	fstp	%st(1)
+	fcos
 	ret
 END (__cosf)
 weak_alias (__cosf, cosf)
diff --git a/sysdeps/i386/fpu/s_sinf.S b/sysdeps/i386/fpu/s_sinf.S
index a010d60f5e..5ca45f52e2 100644
--- a/sysdeps/i386/fpu/s_sinf.S
+++ b/sysdeps/i386/fpu/s_sinf.S
@@ -7,10 +7,23 @@
 
 RCSID("$NetBSD: s_sinf.S,v 1.3 1995/05/09 00:27:53 jtc Exp $")
 
-/* A float's domain isn't large enough to require argument reduction. */
 ENTRY(__sinf)
 	flds	4(%esp)
 	fsin
+	fnstsw	%ax
+	testl	$0x400,%eax
+	jnz	1f
+	ret
+	.align ALIGNARG(4)
+1:	fldpi
+	fadd	%st(0)
+	fxch	%st(1)
+2:	fprem1
+	fnstsw	%ax
+	testl	$0x400,%eax
+	jnz	2b
+	fstp	%st(1)
+	fsin
 	ret
 END (__sinf)
 weak_alias (__sinf, sinf)
diff --git a/sysdeps/i386/fpu/s_tanf.S b/sysdeps/i386/fpu/s_tanf.S
index 7a7509119b..355dff9c8d 100644
--- a/sysdeps/i386/fpu/s_tanf.S
+++ b/sysdeps/i386/fpu/s_tanf.S
@@ -7,10 +7,23 @@
 
 RCSID("$NetBSD: s_tanf.S,v 1.3 1995/05/09 00:31:09 jtc Exp $")
 
-/* A float's domain isn't large enough to require argument reduction. */
 ENTRY(__tanf)
 	flds	4(%esp)
 	fptan
+	fnstsw	%ax
+	testl	$0x400,%eax
+	jnz	1f
+	fstp	%st(0)
+	ret
+1:	fldpi
+	fadd	%st(0)
+	fxch	%st(1)
+2:	fprem1
+	fstsw	%ax
+	testl	$0x400,%eax
+	jnz	2b
+	fstp	%st(1)
+	fptan
 	fstp	%st(0)
 	ret
 END (__tanf)