diff --git a/distro/packages/base.scm b/distro/packages/base.scm
index 4cf9f70a2396c55be8be5c0046b2f868efcc5b57..ca85ca1f3ee37569fcacccd5df47c0612790c5a0 100644
--- a/distro/packages/base.scm
+++ b/distro/packages/base.scm
@@ -751,7 +751,8 @@ (define-public gcc-4.7
                  ;; cross-compiler builds.
 
                  ;; Fix the dynamic linker's file name.
-                 (substitute* "gcc/config/i386/linux64.h"
+                 (substitute* (find-files "gcc/config"
+                                          "^linux(64|-elf)?\\.h$")
                    (("#define GLIBC_DYNAMIC_LINKER([^ ]*).*$" _ suffix)
                     (format #f "#define GLIBC_DYNAMIC_LINKER~a \"~a\"~%"
                             suffix
@@ -759,9 +760,8 @@ (define-public gcc-4.7
 
                  ;; Tell where to find libstdc++, libc, and `?crt*.o', except
                  ;; `crt{begin,end}.o', which come with GCC.
-                 (substitute* '("gcc/config/gnu-user.h"
-                                "gcc/config/i386/gnu-user.h"
-                                "gcc/config/i386/gnu-user64.h")
+                 (substitute* (find-files "gcc/config"
+                                          "^(gnu-user(64)?|linux-elf)\\.h$")
                    (("#define LIB_SPEC (.*)$" _ suffix)
                     (format #f "#define LIB_SPEC \"-L~a/lib -rpath=~a/lib \
 -rpath=~a/lib64 -rpath=~a/lib \" ~a~%"