diff -u facter-1.5.6/debian/changelog facter-1.5.6/debian/changelog
--- facter-1.5.6/debian/changelog
+++ facter-1.5.6/debian/changelog
@@ -1,3 +1,10 @@
+facter (1.5.6-2ubuntu2.3) lucid-proposed; urgency=low
+
+  * lib/facter/ec2.rb: Rescue condition in can_connect() when timeout()
+    actually has a chance to timeout. (LP: #885998) 
+
+ -- Adam Gandelman <adamg@canonical.com>  Mon, 07 Nov 2011 10:18:18 -0800
+
 facter (1.5.6-2ubuntu2.2) lucid-proposed; urgency=low
 
   * lib/facter/ec2.rb: Properly handle ip+port when testing connectivity
diff -u facter-1.5.6/lib/facter/ec2.rb facter-1.5.6/lib/facter/ec2.rb
--- facter-1.5.6/lib/facter/ec2.rb
+++ facter-1.5.6/lib/facter/ec2.rb
@@ -9,7 +9,9 @@
  url = "http://#{ip}:#{port}"
  Timeout::timeout(wait_sec) {open(url)}
  return true
-rescue
+ rescue Timeout::Error
+  return false
+ rescue
   return false
 end