diff --git a/gold/ChangeLog b/gold/ChangeLog
index 23d64ed324..71bee61cf0 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-28  Marcin Kościelnicki  <koriakin@0x04.net>
+
+	PR gold/18959
+	* stringpool.cc (Stringpool_template::new_key_offset): Align all
+	strings, even zero-length.
+	(Stringpool_template::set_string_offsets): Likewise.
+
 2015-10-28  Marcin Kościelnicki  <koriakin@0x04.net>
 
 	* s390.cc: New file.
diff --git a/gold/stringpool.cc b/gold/stringpool.cc
index d6fd7157bf..595b1c74d5 100644
--- a/gold/stringpool.cc
+++ b/gold/stringpool.cc
@@ -228,9 +228,8 @@ Stringpool_template<Stringpool_char>::new_key_offset(size_t length)
   else
     {
       offset = this->offset_;
-      // Align non-zero length strings.
-      if (length != 0)
-	offset = align_address(offset, this->addralign_);
+      // Align strings.
+      offset = align_address(offset, this->addralign_);
       this->offset_ = offset + (length + 1) * sizeof(Stringpool_char);
     }
   this->key_to_offset_.push_back(offset);
@@ -421,6 +420,8 @@ Stringpool_template<Stringpool_char>::set_string_offsets()
           if (this->zero_null_ && (*curr)->first.string[0] == 0)
             this_offset = 0;
           else if (last != v.end()
+                   && ((((*curr)->first.length - (*last)->first.length)
+			% this->addralign_) == 0)
                    && is_suffix((*curr)->first.string,
 				(*curr)->first.length,
                                 (*last)->first.string,