diff -Nru paramiko-1.7.7.1/debian/changelog paramiko-1.7.7.1/debian/changelog
--- paramiko-1.7.7.1/debian/changelog	2012-07-09 11:03:17.000000000 -0400
+++ paramiko-1.7.7.1/debian/changelog	2012-11-12 18:15:17.000000000 -0500
@@ -1,3 +1,10 @@
+paramiko (1.7.7.1-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop problematic hostkey.patch (closes: #682050).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Mon, 12 Nov 2012 23:14:26 +0000
+
 paramiko (1.7.7.1-3) unstable; urgency=low
 
   * Accept NMU uploads (Closes: #659007, #668239)
diff -Nru paramiko-1.7.7.1/debian/patches/hostkey.patch paramiko-1.7.7.1/debian/patches/hostkey.patch
--- paramiko-1.7.7.1/debian/patches/hostkey.patch	2012-07-09 10:43:09.000000000 -0400
+++ paramiko-1.7.7.1/debian/patches/hostkey.patch	1969-12-31 19:00:00.000000000 -0500
@@ -1,17 +0,0 @@
-Index: paramiko-1.7.7.1/paramiko/client.py
-===================================================================
---- paramiko-1.7.7.1.orig/paramiko/client.py	2011-05-22 01:57:09.000000000 +0000
-+++ paramiko-1.7.7.1/paramiko/client.py	2012-07-05 00:38:50.000000000 +0000
-@@ -303,11 +303,7 @@
- 
-         server_key = t.get_remote_server_key()
-         keytype = server_key.get_name()
--
--        if port == SSH_PORT:
--            server_hostkey_name = hostname
--        else:
--            server_hostkey_name = "[%s]:%d" % (hostname, port)
-+        server_hostkey_name = hostname
-         our_server_key = self._system_host_keys.get(server_hostkey_name, {}).get(keytype, None)
-         if our_server_key is None:
-             our_server_key = self._host_keys.get(server_hostkey_name, {}).get(keytype, None)
diff -Nru paramiko-1.7.7.1/debian/patches/series paramiko-1.7.7.1/debian/patches/series
--- paramiko-1.7.7.1/debian/patches/series	2012-07-09 10:43:09.000000000 -0400
+++ paramiko-1.7.7.1/debian/patches/series	2012-11-12 18:15:44.000000000 -0500
@@ -1,2 +1 @@
-hostkey.patch
 Fix-SSHException-when-re-keying-over-a-fast-connection.patch