diff --git a/ChangeLog b/ChangeLog
index f755cd3cf5..ce4d411f50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2017-02-08  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
+
+	* math/Makefile (libm-calls): Move w_exp...
+	(libm-compat-calls-auto): Here.
+
+	* math/w_expl.c: Add suffix "_compat" to filename.
+	* sysdeps/ia64/fpu/w_expl.c: Likewise.
+	* sysdeps/ia64/fpu/w_expf.c: Likewise.
+	* sysdeps/ia64/fpu/w_exp.c: Likewise.
+	* sysdeps/ieee754/dbl-64/w_exp.c: Likewise.
+	* sysdeps/ieee754/flt-32/w_expf.c: Likewise.
+	* sysdeps/ieee754/ldbl-128/w_expl.c: Likewise.
+	* sysdeps/ieee754/ldbl-128ibm/w_expl.c: Likewise.
+	* sysdeps/ieee754/ldbl-96/w_expl.c: Likewise.
+
+	* math/w_expl_compat.c: New file, copied from above.
+	* sysdeps/ia64/fpu/w_exp_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_expf_compat.c: Likewise.
+	* sysdeps/ia64/fpu/w_expl_compat.c: Likewise.
+	* sysdeps/ieee754/dbl-64/w_exp_compat.c: Likewise.
+	* sysdeps/ieee754/flt-32/w_expf_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-128/w_expl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c: Likewise.
+	* sysdeps/ieee754/ldbl-96/w_expl_compat.c: Likewise.
+
+	* sysdeps/ieee754/ldbl-64-128/w_expl.c: Add suffix "_compat"
+	to filename.
+	* sysdeps/ieee754/ldbl-opt/w_exp.c: Likewise.
+
+	* sysdeps/ieee754/ldbl-64-128/w_expl_compat.c: New file,
+	copied from above and adjusted for the new filenames.
+	* sysdeps/ieee754/ldbl-opt/w_exp_compat.c: Likewise.
+
 2017-02-08  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 
 	* math/Makefile (libm-calls): Move w_lgammaF...
diff --git a/math/Makefile b/math/Makefile
index fbbef49268..0f59123ce9 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -66,7 +66,6 @@ libm-calls =								  \
 	s_floorF s_log1pF s_logbF				  \
 	s_nextafterF s_nexttowardF s_rintF s_scalblnF			  \
 	s_significandF s_sinF s_tanF s_tanhF				  \
-	w_expF								  \
 	s_fpclassifyF s_truncF						  \
 	s_remquoF e_log2F e_exp2F s_roundF s_nearbyintF s_sincosF	  \
 	s_fmaF s_lrintF s_llrintF s_lroundF s_llroundF e_exp10F		  \
@@ -83,7 +82,7 @@ libm-compat-calls-auto =						\
 	w_jnF_compat w_log2F_compat w_log10F_compat w_logF_compat	\
 	w_powF_compat w_remainderF_compat w_scalbF_compat		\
 	w_sinhF_compat w_sqrtF_compat w_tgammaF_compat			\
-	w_lgammaF_r_compat w_lgammaF_compat2
+	w_lgammaF_r_compat w_lgammaF_compat2 w_expF_compat
 
 libm-compat-calls-ldouble-yes = w_lgamma_compatl k_standardl
 libm-compat-calls = w_lgamma_compatf w_lgamma_compat k_standard k_standardf \
diff --git a/math/w_expl.c b/math/w_expl_compat.c
similarity index 100%
rename from math/w_expl.c
rename to math/w_expl_compat.c
diff --git a/sysdeps/ia64/fpu/w_exp.c b/sysdeps/ia64/fpu/w_exp_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_exp.c
rename to sysdeps/ia64/fpu/w_exp_compat.c
diff --git a/sysdeps/ia64/fpu/w_expf.c b/sysdeps/ia64/fpu/w_expf_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_expf.c
rename to sysdeps/ia64/fpu/w_expf_compat.c
diff --git a/sysdeps/ia64/fpu/w_expl.c b/sysdeps/ia64/fpu/w_expl_compat.c
similarity index 100%
rename from sysdeps/ia64/fpu/w_expl.c
rename to sysdeps/ia64/fpu/w_expl_compat.c
diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp_compat.c
similarity index 100%
rename from sysdeps/ieee754/dbl-64/w_exp.c
rename to sysdeps/ieee754/dbl-64/w_exp_compat.c
diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf_compat.c
similarity index 100%
rename from sysdeps/ieee754/flt-32/w_expf.c
rename to sysdeps/ieee754/flt-32/w_expf_compat.c
diff --git a/sysdeps/ieee754/ldbl-128/w_expl.c b/sysdeps/ieee754/ldbl-128/w_expl_compat.c
similarity index 100%
rename from sysdeps/ieee754/ldbl-128/w_expl.c
rename to sysdeps/ieee754/ldbl-128/w_expl_compat.c
diff --git a/sysdeps/ieee754/ldbl-128ibm/w_expl.c b/sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c
similarity index 100%
rename from sysdeps/ieee754/ldbl-128ibm/w_expl.c
rename to sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c
diff --git a/sysdeps/ieee754/ldbl-64-128/w_expl.c b/sysdeps/ieee754/ldbl-64-128/w_expl_compat.c
similarity index 67%
rename from sysdeps/ieee754/ldbl-64-128/w_expl.c
rename to sysdeps/ieee754/ldbl-64-128/w_expl_compat.c
index 2a402b04c0..37c153e2a4 100644
--- a/sysdeps/ieee754/ldbl-64-128/w_expl.c
+++ b/sysdeps/ieee754/ldbl-64-128/w_expl_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <sysdeps/ieee754/ldbl-128/w_expl.c>
+#include <sysdeps/ieee754/ldbl-128/w_expl_compat.c>
 long_double_symbol (libm, __expl, expl);
diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl_compat.c
similarity index 100%
rename from sysdeps/ieee754/ldbl-96/w_expl.c
rename to sysdeps/ieee754/ldbl-96/w_expl_compat.c
diff --git a/sysdeps/ieee754/ldbl-opt/w_exp.c b/sysdeps/ieee754/ldbl-opt/w_exp_compat.c
similarity index 71%
rename from sysdeps/ieee754/ldbl-opt/w_exp.c
rename to sysdeps/ieee754/ldbl-opt/w_exp_compat.c
index 61fcfcc9df..686c9c26d0 100644
--- a/sysdeps/ieee754/ldbl-opt/w_exp.c
+++ b/sysdeps/ieee754/ldbl-opt/w_exp_compat.c
@@ -1,5 +1,5 @@
 #include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/w_exp.c>
+#include <sysdeps/ieee754/dbl-64/w_exp_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __exp, expl, GLIBC_2_0);
 #endif