diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index f02db93f8eb..651f8a9a5f0 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* setenv.c <environ>: Declare only if not a macro.
+
 2015-04-14  Max Ostapenko  <m.ostapenko@partner.samsung.com>
 
 	* testsuite/Makefile.in (LIBCFLAGS): Add LDFLAGS.
diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 96917d5769f..714ca0a4076 100644
--- a/libiberty/setenv.c
+++ b/libiberty/setenv.c
@@ -63,8 +63,10 @@ extern int errno;
 
 #define __environ	environ
 #ifndef HAVE_ENVIRON_DECL
+#ifndef environ
 extern char **environ;
 #endif
+#endif
 
 #undef setenv
 #undef unsetenv