diff --git a/glibc-arm-clone-unwind-fix.diff b/glibc-arm-clone-unwind-fix.diff
new file mode 100644
index 0000000..67ff4fd
--- /dev/null
+++ b/glibc-arm-clone-unwind-fix.diff
@@ -0,0 +1,23 @@
+--- ports/sysdeps/unix/sysv/linux/arm/clone.S
++++ ports/sysdeps/unix/sysv/linux/arm/clone.S
+@@ -81,8 +81,11 @@
+ 	RETINSTR(, lr)
+ 
+ 	cfi_startproc
+-	cfi_undefined (lr)
++PSEUDO_END (__clone)
++
+ 1:
++	.fnstart
++	.cantunwind
+ #ifdef RESET_PID
+ 	tst	ip, #CLONE_THREAD
+ 	bne	3f
+@@ -116,6 +119,6 @@
+ 	@ and we are done, passing the return value through r0
+ 	b	PLTJMP(HIDDEN_JUMPTARGET(_exit))
+ 
+-PSEUDO_END (__clone)
++	.fnend
+ 
+ weak_alias (__clone, clone)
diff --git a/glibc-ports-2.14.1.tar.bz2 b/glibc-ports-2.14.1.tar.bz2
new file mode 100644
index 0000000..fc95bf9
--- /dev/null
+++ b/glibc-ports-2.14.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0c20932cf850dd722662162d69658c1bca45759121a32e502c5dd4889e071c6
+size 630640
diff --git a/glibc-ports-2.14.tar.bz2 b/glibc-ports-2.14.tar.bz2
deleted file mode 100644
index 663c30d..0000000
--- a/glibc-ports-2.14.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:808f0f6938af4d17fe6c091597df02d85ca5b4a3da21daf5065cba9a32ec7d02
-size 627448
diff --git a/glibc.changes b/glibc.changes
index 35a1292..7774edc 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Nov  7 21:06:32 CET 2011 - dmueller@suse.de
+
+- update glibc-ports to 2.14.1:
+  * Align the constant pool in start.S to 4 bytes.
+  * sysdeps/unix/sysv/linux/arm/eabi/internal_sendmmsg.S: New.
+- Fix unwinding crash when using clone()
+
 -------------------------------------------------------------------
 Thu Oct 20 08:58:47 UTC 2011 - aj@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index 1a57909..ca70ab3 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -83,7 +83,7 @@ Release:        12
 Url:            http://www.gnu.org/software/libc/libc.html
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         glibc-%{version}-%{git_id}.tar.bz2
-Source2:        http://ftp.gnu.org/gnu/glibc/glibc-ports-2.14.tar.bz2
+Source2:        http://ftp.gnu.org/gnu/glibc/glibc-ports-%{version}.tar.bz2
 Source3:        noversion.tar.bz2
 Source4:        manpages.tar.bz2
 Source8:        nsswitch.conf
@@ -215,6 +215,8 @@ Patch80:        crypt_blowfish-1.2-sha.diff
 Patch81:        crypt_blowfish-1.2-versioning.diff
 # PATCH-FIX-OPENSUSE Avoid build failure on noexecstack marker on ARM dmueller@suse.de
 Patch82:        crypt_blowfish-1.2-hack_around_arm.diff
+# PATCH-FIX-UPSTREAM fix unwinding when using clone()
+Patch83:        glibc-arm-clone-unwind-fix.diff
 
 %description
 The GNU C Library provides the most important standard libraries used
@@ -377,6 +379,7 @@ versions of your software.
 # add glibc-ports for arm
 %setup -n glibc-%{version} -q -a 2 -a 3 -a 4
 mv glibc-ports-* ports
+%patch83
 %else
 # any other leave out ports
 %setup -n glibc-%{version} -q -a 3 -a 4