diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb
index 9255364a98..9b45e3b6d0 100644
--- a/Library/Homebrew/cmd/bottle.rb
+++ b/Library/Homebrew/cmd/bottle.rb
@@ -27,10 +27,12 @@ BOTTLE_ERB = <<-EOS
     <% if revision > 0 %>
     revision <%= revision %>
     <% end %>
-    <% checksums.keys.each do |checksum_type| %>
-    <% checksum, osx = checksums[checksum_type].shift %>
+    <% checksums.each do |checksum_type, checksum_values| %>
+    <% checksum_values.each do |checksum_value| %>
+    <% checksum, osx = checksum_value.shift %>
     <%= checksum_type %> '<%= checksum %>' => :<%= osx %>
     <% end %>
+    <% end %>
   end
 EOS
 
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 5301c0c020..a4f4f56f34 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -114,7 +114,8 @@ class Bottle < SoftwareSpec
       os_versions.sort.reverse.each do |os_version|
         osx = os_version.to_sym
         checksum = checksum_os_versions[osx]
-        checksums[checksum_type] = { checksum => osx }
+        checksums[checksum_type] ||= []
+        checksums[checksum_type] << { checksum => osx }
       end
     end
     checksums