diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7d74dda20c3..6f03dc41728 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-20  Richard Guenther  <rguenther@suse.de>
+
+	* tree-vect-data-refs.c (vect_can_force_dr_alignment_p):
+	Allow adjusting alignment of user-aligned decls again.
+
 2012-06-20  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* config/rl78/rl78-c.c: Remove unnecessary includes.
diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index e12fddceb66..42f5518d6e5 100644
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -4731,10 +4731,9 @@ vect_can_force_dr_alignment_p (const_tree decl, unsigned int alignment)
   if (TREE_ASM_WRITTEN (decl))
     return false;
 
-  /* Do not override explicit alignment set by the user or the alignment
-     as specified by the ABI when the used attribute is set.  */
-  if (DECL_USER_ALIGN (decl)
-      || DECL_PRESERVE_P (decl))
+  /* Do not override the alignment as specified by the ABI when the used
+     attribute is set.  */
+  if (DECL_PRESERVE_P (decl))
     return false;
 
   if (TREE_STATIC (decl))