diff --git a/glibc.changes b/glibc.changes
index 7ac51c1..13f21b3 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Sep 22 21:07:43 CEST 2011 - dmueller@suse.de
+
+- fix ports build
+
+-------------------------------------------------------------------
+Thu Sep 22 13:10:02 UTC 2011 - adrian@suse.de
+
+- add armv8l architecture
+- don't enforce armv5tel for all arm architectures anymore
+
 -------------------------------------------------------------------
 Mon Sep 19 08:09:40 UTC 2011 - opensuse@cboltz.de
 
diff --git a/glibc.spec b/glibc.spec
index e670be1..f2d4280 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -365,10 +365,8 @@ versions of your software.
 %endif
 
 %prep
-%ifarch %arm armv5tel armv7l
+%ifarch %arm armv5tel armv7l armv8l
 # add glibc-ports for arm
-# this is CURRENTLY BROKEN (as of 2009-11-13); ARM-interested
-# contributors need to provide new tested glibc-ports source
 %setup -n glibc-%{version} -q -a 2 -a 3 -a 4
 %else
 # any other leave out ports
@@ -534,9 +532,9 @@ PARALLEL="%{?_smp_mflags}"
 %ifarch %ix86
 	add_ons=$add_ons,noversion
 %endif
-%ifarch %arm armv5tel armv7l
-	add_ons=$add_ons,ports
-	BuildFlags="-march=armv5te -O2 -Wall"
+%ifarch %arm armv5tel armv7l armv8l
+	add_ons=$add_ons,glibc-ports-%{version}
+	BuildFlags="$BuildFlags -fasynchronous-unwind-tables"
 	# fails to build otherwise - need to recheck and fix
 	%define enable_stackguard_randomization 0
 %endif
@@ -555,7 +553,7 @@ configure_and_build_glibc() {
 %if %{enable_stackguard_randomization}
 		--enable-stackguard-randomization \
 %endif
-%ifarch %arm armv5tel armv7l
+%ifarch %arm armv5tel armv7l armv8l
 		--build=%{_target_cpu}-suse-linux-gnueabi \
 %else
 		--build=%{_target_cpu}-suse-linux \
@@ -925,7 +923,7 @@ exit 0
 			%ifarch x86_64
 				/%{_lib}/ld-linux-x86-64.so.2
 			%else
-				%ifarch %arm armv5tel armv7l
+				%ifarch %arm armv5tel armv7l armv8l
 					/%{_lib}/ld-linux.so.3
 				%else
 					/%{_lib}/ld-linux.so.2