diff --git a/gas/ChangeLog b/gas/ChangeLog
index 272347e8cc..1e6d8c8fd1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-11  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* config/tc-arm.c (arm_handle_align): When truncating an aligned 
+	block, ensure that the low order bits of the alignment are
+	preserved.
+
 2001-05-10  Alan Modra  <amodra@one.net.au>
 
 	* config/obj-vms.c (obj_crawl_symbol_chain): Don't take address of
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 59e8d71a44..b394faaa86 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -8816,7 +8816,7 @@ arm_handle_align (fragP)
   fix = 0;
   
   if (bytes > MAX_MEM_FOR_RS_ALIGN_CODE)
-    bytes = MAX_MEM_FOR_RS_ALIGN_CODE;
+    bytes &= MAX_MEM_FOR_RS_ALIGN_CODE;
   
   if (fragP->tc_frag_data)
     {