diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8365f8a1..5b082c1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ appear at the top.
 
   * Add your entries below here, remember to credit yourself however you want
     to be credited!
+  * Fixed a crash occurring when `Host@keys` was set to a non-Enumerable.
+    @xavierholt [PR #360](https://github.com/capistrano/sshkit/pull/360)
 
 ## [1.11.1][] (2016-06-17)
 
diff --git a/lib/sshkit/host.rb b/lib/sshkit/host.rb
index e149abf2..f5a9818f 100644
--- a/lib/sshkit/host.rb
+++ b/lib/sshkit/host.rb
@@ -17,7 +17,7 @@ def keys=(new_keys)
     end
 
     def keys
-      @keys
+      Array(@keys)
     end
 
     def initialize(host_string_or_options_hash)