diff -Nru stress-ng-0.05.23/debian/changelog stress-ng-0.05.23/debian/changelog
--- stress-ng-0.05.23/debian/changelog	2016-04-22 10:39:34.000000000 +0000
+++ stress-ng-0.05.23/debian/changelog	2016-04-26 11:17:17.000000000 +0000
@@ -1,3 +1,10 @@
+stress-ng (0.05.23-1ubuntu2) xenial; urgency=medium
+
+  * Fix alignment mask to ensure stacks are 16 byte aligned (LP: #1573117)
+    - incorrect mask used in previous fix, now using correct mask
+
+ -- Colin King <colin.king@canonical.com>  Tue, 26 Apr 2016 12:16:47 +0100
+
 stress-ng (0.05.23-1ubuntu1) xenial; urgency=medium
 
   * Ensure all clone() calls are 16 byte aligned for aarch64 (LP: #1573117)
diff -Nru stress-ng-0.05.23/debian/patches/0003-Fix-alignment-mask-to-ensure-stacks-are-16-byte-alig.patch stress-ng-0.05.23/debian/patches/0003-Fix-alignment-mask-to-ensure-stacks-are-16-byte-alig.patch
--- stress-ng-0.05.23/debian/patches/0003-Fix-alignment-mask-to-ensure-stacks-are-16-byte-alig.patch	1970-01-01 00:00:00.000000000 +0000
+++ stress-ng-0.05.23/debian/patches/0003-Fix-alignment-mask-to-ensure-stacks-are-16-byte-alig.patch	2016-04-26 11:14:51.000000000 +0000
@@ -0,0 +1,32 @@
+From d12036f3b0bb62b2bc9203d1ca4dae032d50092e Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Tue, 26 Apr 2016 12:11:34 +0100
+Subject: [PATCH] Fix alignment mask to ensure stacks are 16 byte aligned (LP:
+ #1573117)
+
+The original fix that was checked in had the incorrect mask, and was
+hence doing nothing. Fix this by setting the mask correctly to ensure
+the stack alignment has all zeros on the bottom 4 bits.
+
+Fixes: 8b9eb2900ab870c634 (Ensure all clone() calls are 16 byte aligned for aarch64)
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+---
+ stress-ng.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/stress-ng.h b/stress-ng.h
+index 1f0d772..0b69300 100644
+--- a/stress-ng.h
++++ b/stress-ng.h
+@@ -2221,7 +2221,7 @@ static inline int exit_status(const int err)
+  */
+ static inline void *align_stack(void *stack_top)
+ {
+-	return (void *)((uintptr_t)stack_top & ~(uintptr_t)0);
++	return (void *)((uintptr_t)stack_top & ~(uintptr_t)0xf);
+ 
+ }
+ 
+-- 
+2.7.4
+
diff -Nru stress-ng-0.05.23/debian/patches/series stress-ng-0.05.23/debian/patches/series
--- stress-ng-0.05.23/debian/patches/series	2016-04-22 10:50:19.000000000 +0000
+++ stress-ng-0.05.23/debian/patches/series	2016-04-26 11:15:27.000000000 +0000
@@ -1,2 +1,3 @@
 0001-stress-mmap-handle-SIGBUS-signals-LP-1569468.patch
 0002-Ensure-all-clone-calls-are-16-byte-aligned-for-aarch.patch
+0003-Fix-alignment-mask-to-ensure-stacks-are-16-byte-alig.patch