diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4d38403b3b0..79ba6475d24 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-08  Jan Beulich <jbeulich@suse.com>
+
+	* gas/config/tc-arm.c (do_neon_ldr_str): Correct disgnostics for
+	PC-relative VSTR.
+
 2013-04-08  Jan Beulich <jbeulich@suse.com>
 
 	* gas/config/tc-arm.c (reg_names): Convert duplicate SP_fiq
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index f3b1ebfb13f..8acfdd7a2f1 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -15692,10 +15692,10 @@ do_neon_ldr_str (void)
       && inst.operands[1].reg == REG_PC
       && (ARM_CPU_HAS_FEATURE (selected_cpu, arm_ext_v7) || thumb_mode))
     {
-      if (!thumb_mode && warn_on_deprecated)
-	as_warn (_("Use of PC here is deprecated"));
-      else
+      if (thumb_mode)
 	inst.error = _("Use of PC here is UNPREDICTABLE");
+      else if (warn_on_deprecated)
+	as_warn (_("Use of PC here is deprecated"));
     }
 
   if (inst.operands[0].issingle)