diff --git a/glibc.changes b/glibc.changes
index 8426c7d..a0edbcc 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 25 10:40:20 UTC 2012 - aj@suse.de
+
+- Also check for armv7hl.
+
 -------------------------------------------------------------------
 Wed Apr 25 08:47:22 UTC 2012 - adrian@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index 666a560..7cfec31 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -546,7 +546,7 @@ rm nscd/s-stamp
 %endif
 
 %patch2001 -p1
-%ifarch armv7l
+%ifarch armv7l armv7hl
 %patch2002 -p1
 %endif
 %patch2003 -p1
@@ -619,6 +619,8 @@ BuildFlags="%{optflags} -U_FORTIFY_SOURCE"
 BuildFlags="$(echo $BuildFlags | sed -e 's#-fstack-protector##' -e 's#-ffortify=[0-9]*##')"
 BuildCC="%__cc"
 BuildCCplus="%__cxx"
+BuildCC="gcc-4.6"
+BuildCCplus="g++-4.6"
 add_ons=",libidn"
 PARALLEL="%{?_smp_mflags}"
 #
@@ -1024,7 +1026,7 @@ mkdir -p %{buildroot}/lib/systemd/system
 install -m 644 %{SOURCE21} %{buildroot}/lib/systemd/system
 install -m 644 %{SOURCE22} %{buildroot}/lib/systemd/system
 
-%ifarch armv7l
+%ifarch armv7l armv7hl
 # Provide compatibility link
 ln -s ld-%{version}.so %{buildroot}/lib/ld-linux.so.3
 %endif
@@ -1104,7 +1106,7 @@ exit 0
 
 # Each architecture has a different name for the dynamic linker:
 %ifarch %arm
-%ifarch armv7l
+%ifarch armv7l armv7hl
 /%{_lib}/ld-linux-armhf.so.3
 # Keep compatibility link
 /%{_lib}/ld-linux.so.3