diff --git a/Makefile.target b/Makefile.target
index 68fcd11448..4b8005570e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -60,7 +60,7 @@ LIBS+=-lwinmm -lws2_32 -liphlpapi
 endif
 ifdef CONFIG_SOLARIS
 LIBS+=-lsocket -lnsl -lresolv
-ifdef NEEDS_LIBSUNMATH
+ifdef CONFIG_NEEDS_LIBSUNMATH
 LIBS+=-lsunmath
 LDFLAGS+=-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib
 CFLAGS+=-I/opt/SUNWspro/prod/include/cc
diff --git a/configure b/configure
index 366b336e1b..44f544a3f9 100755
--- a/configure
+++ b/configure
@@ -1558,8 +1558,8 @@ if test "$solaris" = "yes" ; then
   echo "#define CONFIG_SOLARIS 1" >> $config_host_h
   echo "#define CONFIG_SOLARIS_VERSION $solarisrev" >> $config_host_h
   if test "$needs_libsunmath" = "yes" ; then
-    echo "NEEDS_LIBSUNMATH=yes" >> $config_host_mak
-    echo "#define NEEDS_LIBSUNMATH 1" >> $config_host_h
+    echo "CONFIG_NEEDS_LIBSUNMATH=y" >> $config_host_mak
+    echo "#define CONFIG_NEEDS_LIBSUNMATH 1" >> $config_host_h
   fi
 fi
 if test -n "$sparc_cpu"; then
diff --git a/fpu/softfloat-native.h b/fpu/softfloat-native.h
index 0bba084405..0893ce36ff 100644
--- a/fpu/softfloat-native.h
+++ b/fpu/softfloat-native.h
@@ -62,7 +62,7 @@
 #define isunordered(x,y)        unordered(x, y)
 #endif
 
-#if defined(__sun__) && !defined(NEED_LIBSUNMATH)
+#if defined(__sun__) && !defined(CONFIG_NEEDS_LIBSUNMATH)
 
 #ifndef isnan
 # define isnan(x) \
diff --git a/fpu/softfloat.h b/fpu/softfloat.h
index bebfefd057..789179a6b2 100644
--- a/fpu/softfloat.h
+++ b/fpu/softfloat.h
@@ -32,7 +32,7 @@ these four paragraphs for those parts of this code that are retained.
 #ifndef SOFTFLOAT_H
 #define SOFTFLOAT_H
 
-#if defined(CONFIG_SOLARIS) && defined(NEEDS_LIBSUNMATH)
+#if defined(CONFIG_SOLARIS) && defined(CONFIG_NEEDS_LIBSUNMATH)
 #include <sunmath.h>
 #endif