diff -u gajim-0.13/debian/changelog gajim-0.13/debian/changelog
--- gajim-0.13/debian/changelog
+++ gajim-0.13/debian/changelog
@@ -1,3 +1,10 @@
+gajim (0.13-0ubuntu3) lucid; urgency=low
+
+  * Add chatroom-control-menu.patch to get popup control menu for groupchats
+    working (LP:505158).
+
+ -- Alexey Osipov <lion-simba@pridelands.ru>  Thu, 29 Apr 2010 23:00:15 +0700
+
 gajim (0.13-0ubuntu2) lucid; urgency=low
 
   * debian/control:
diff -u gajim-0.13/debian/patches/00list gajim-0.13/debian/patches/00list
--- gajim-0.13/debian/patches/00list
+++ gajim-0.13/debian/patches/00list
@@ -2,0 +3 @@
+chatroom-control-menu.patch
only in patch2:
unchanged:
--- gajim-0.13.orig/debian/patches/chatroom-control-menu.patch
+++ gajim-0.13/debian/patches/chatroom-control-menu.patch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## chatroom-control-menu.dpatch by Alexey Osipov <lion-simba@pridelands.ru>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gajim/+bug/505158
+## DP: Description: Fix misnamed symbol.
+
+@DPATCH@
+diff -urNad gajim-0.13~/src/groupchat_control.py gajim-0.13/src/groupchat_control.py
+--- gajim-0.13~/src/groupchat_control.py	2009-11-10 00:01:18.000000000 +0600
++++ gajim-0.13/src/groupchat_control.py	2010-04-29 22:55:22.544990597 +0700
+@@ -647,7 +647,7 @@
+ 		bookmark_separator = xml.get_widget('bookmark_separator')
+ 		separatormenuitem2 = xml.get_widget('separatormenuitem2')
+ 
+-		if hide_buttonbar_entries:
++		if hide_buttonbar_items:
+ 			change_nick_menuitem.hide()
+ 			change_subject_menuitem.hide()
+ 			bookmark_room_menuitem.hide()