diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index b2bb3f1d2e..3427f0d182 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-24  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (read_cie): Revert check for unused augmentation data -
+	it was bogus.
+
 2014-12-23  Andrew Stubbs  <ams@codesourcery.com>
 
 	* objcopy.c (strip_usage): Reword --remove-section description.
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index e4efd06581..332d700970 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -5535,13 +5535,8 @@ read_cie (unsigned char *start, unsigned char *end,
 	    break;
 	  p++;
 	}
-
-      if (q < qend)
-	{
-	  warn (_("Not enough augmentation data (%lx bytes still needed)\n"),
-		(long) ((augmentation_data + augmentation_data_len) - q));
-	  augmentation_data_len = q - augmentation_data;
-	}
+      /* Note - it is OK if this loop terminates with q < qend.
+	 Padding may have been inserted to align the end of the CIE.  */
     }
 
   *p_cie = fc;