diff -u silc-client-1.1.7/debian/changelog silc-client-1.1.7/debian/changelog
--- silc-client-1.1.7/debian/changelog
+++ silc-client-1.1.7/debian/changelog
@@ -1,3 +1,10 @@
+silc-client (1.1.7-1ubuntu0.1) maverick-proposed; urgency=low
+
+  * Patch from Debian bug #577501.  Fix compatibility with irssi 0.8.15.  Patch 
+    written by Stefan Vetsch, many thanks to him. (LP: #655311)
+
+ -- Micah Gersten <micahg@ubuntu.com>  Tue, 12 Oct 2010 21:41:47 -0500
+
 silc-client (1.1.7-1) unstable; urgency=low
 
   [ Jérémy Bobbio ]
diff -u silc-client-1.1.7/debian/control silc-client-1.1.7/debian/control
--- silc-client-1.1.7/debian/control
+++ silc-client-1.1.7/debian/control
@@ -1,7 +1,8 @@
 Source: silc-client
 Section: net
 Priority: optional
-Maintainer: Debian SILC Team <pkg-silc-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian SILC Team <pkg-silc-devel@lists.alioth.debian.org>
 Uploaders: Jérémy Bobbio <lunar@debian.org>, Micah Anderson <micah@debian.org>
 Standards-Version: 3.8.2
 Build-Depends: debhelper (>> 5), libglib2.0-dev, irssi-dev, libsilc-dev, libperl-dev
only in patch2:
unchanged:
--- silc-client-1.1.7.orig/apps/irssi/src/silc/core/client_ops.c
+++ silc-client-1.1.7/apps/irssi/src/silc/core/client_ops.c
@@ -2790,6 +2790,15 @@
   silc_free(a);
 }
 
+/* helper function to emulate server_setup_find_port */
+static SERVER_SETUP_REC *silc_server_setup_find_port(const char *address,
+						     int port) {
+  SERVER_SETUP_REC *rec;
+
+  rec = server_setup_find(address, port, NULL);
+  return (rec == NULL || rec->port != port) ? NULL : rec;
+}
+
 /* Find authentication data by hostname and port. The hostname may be IP
    address as well.*/
 
@@ -2811,7 +2820,7 @@
 
   /* Check whether we find the password for this server in our
      configuration.  If it's set, always send it server. */
-  setup = server_setup_find_port(hostname, port);
+  setup = silc_server_setup_find_port(hostname, port);
   if (setup && setup->password) {
     completion(SILC_AUTH_PASSWORD, setup->password, strlen(setup->password),
 	       context);