diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 32f8ad194..0ba2fdf7b 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-29  Ralf Corsépius  <ralf.corsepius@rtems.org>
+
+	* libm/complex/catan.c, libm/complex/catanf.c,
+	libm/complex/ctan.c, libm/complex/ctanf.c:
+	Use HUGE_VAL instead of MAXNUM.
+
 2010-11-25  Ralf Corsépius  <ralf.corsepius@rtems.org>
 
 	* libm/complex/cargf.c: Use crealf instead of creal.
diff --git a/newlib/libm/complex/catan.c b/newlib/libm/complex/catan.c
index 2cb91bb08..bf9ea01ff 100644
--- a/newlib/libm/complex/catan.c
+++ b/newlib/libm/complex/catan.c
@@ -91,8 +91,6 @@ QUICKREF
 __weak_alias(catan, _catan)
 #endif
 
-#define MAXNUM 1.0e308
-
 double complex
 catan(double complex z)
 {
@@ -127,6 +125,6 @@ ovrf:
 #if 0
 	mtherr ("catan", OVERFLOW);
 #endif
-	w = MAXNUM + MAXNUM * I;
+	w = HUGE_VAL + HUGE_VAL * I;
 	return w;
 }
diff --git a/newlib/libm/complex/catanf.c b/newlib/libm/complex/catanf.c
index bba0f7730..ac1a65c08 100644
--- a/newlib/libm/complex/catanf.c
+++ b/newlib/libm/complex/catanf.c
@@ -40,8 +40,6 @@
 __weak_alias(catanf, _catanf)
 #endif
 
-#define MAXNUMF 1.0e38F
-
 float complex
 catanf(float complex z)
 {
@@ -76,6 +74,6 @@ ovrf:
 #if 0
 	mtherr ("catan", OVERFLOW);
 #endif
-	w = MAXNUMF + MAXNUMF * I;
+	w = HUGE_VALF + HUGE_VALF * I;
 	return w;
 }
diff --git a/newlib/libm/complex/ctan.c b/newlib/libm/complex/ctan.c
index 8a566b66b..fb0db3497 100644
--- a/newlib/libm/complex/ctan.c
+++ b/newlib/libm/complex/ctan.c
@@ -69,8 +69,6 @@ QUICKREF
 #include <math.h>
 #include "cephes_subr.h"
 
-#define MAXNUM 1.0e308
-
 double complex
 ctan(double complex z)
 {
@@ -84,7 +82,7 @@ ctan(double complex z)
 
 	if (d == 0.0) {
 		/* mtherr ("ctan", OVERFLOW); */
-		w = MAXNUM + MAXNUM * I;
+		w = HUGE_VAL + HUGE_VAL * I;
 		return w;
 	}
 
diff --git a/newlib/libm/complex/ctanf.c b/newlib/libm/complex/ctanf.c
index 746dc6986..a75ff1c66 100644
--- a/newlib/libm/complex/ctanf.c
+++ b/newlib/libm/complex/ctanf.c
@@ -36,8 +36,6 @@
 #include <math.h>
 #include "cephes_subrf.h"
 
-#define MAXNUMF 1.0e38f
-
 float complex
 ctanf(float complex z)
 {
@@ -51,7 +49,7 @@ ctanf(float complex z)
 
 	if (d == 0.0f) {
 		/* mtherr ("ctan", OVERFLOW); */
-		w = MAXNUMF + MAXNUMF * I;
+		w = HUGE_VALF + HUGE_VALF * I;
 		return w;
 	}