diff --git a/ChangeLog b/ChangeLog
index 7f2e75c4f4..43b0b61295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-05  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* Makeconfig (link-libc-static): Use --{start,end}-group to handle
+	circular dependency between libgcc.a and libc.a.
+
 2011-05-05  Andreas Schwab  <schwab@redhat.com>
 
 	* resolv/netdb.h: Don't include <rpc/netdb.h>.
diff --git a/Makeconfig b/Makeconfig
index 0c4c75aefa..4d914589d7 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -531,7 +531,7 @@ endif
 
 # The static libraries.
 ifeq (yes,$(build-static))
-link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
+link-libc-static = -Wl,--start-group $(common-objpfx)libc.a $(static-gnulib) -Wl,--end-group
 else
 ifeq (yes,$(build-shared))
 # We can try to link the programs with lib*_pic.a...