diff --git a/extensions/Debug.xml b/extensions/Debug.xml
new file mode 100644
index 0000000..96c4cfb
--- /dev/null
+++ b/extensions/Debug.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" ?>
+<node name="/Debug"
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <tp:copyright>Copyright (C) 2009 Collabora Ltd.</tp:copyright>
+  <tp:license xmlns="http://www.w3.org/1999/xhtml">
+    <p>This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.</p>
+
+<p>This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.</p>
+
+<p>You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
+  </tp:license>
+  <interface name="org.freedesktop.Telepathy.Debug">
+
+    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+      <p>An interface for providing debug messages.
+
+         This interface is primarily provided by one object per
+         service, at the path <tt>/org/freedesktop/Telepathy/debug</tt>.
+      </p>
+    </tp:docstring>
+
+    <property name="Enabled" type="b" access="readwrite">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>TRUE if the NewDebugMessage signal should be emitted when a new
+           debug message is generated.</p>
+      </tp:docstring>
+    </property>
+
+    <method name="GetMessages">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>Retrieve buffered debug messages.</p>
+      </tp:docstring>
+
+      <arg direction="out" name="messages" type="a(dsus)">
+         <tp:docstring>
+          A list of timestamped debug messages.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <signal name="NewDebugMessage" tp:name-for-bindings="New_Debug_Message">
+      <tp:docstring>
+        Emitted when a debug messages is generated if the Enabled property is
+        set.
+      </tp:docstring>
+
+      <arg name="time" type="d">
+        <tp:docstring>
+          Message timestamp
+        </tp:docstring>
+      </arg>
+      <arg name="domain" type="s">
+	<tp:docstring>
+	  Message domain
+	</tp:docstring>
+      </arg>
+      <arg name="level" type="u" tp:type="Debug_Level">
+	<tp:docstring>
+	  Message level
+	</tp:docstring>
+      </arg>
+      <arg name="message" type="s">
+        <tp:docstring>
+          Message
+        </tp:docstring>
+      </arg>
+    </signal>
+
+    <tp:enum name="Debug_Level" type="u">
+      <tp:enumvalue suffix="Error" value="0">
+	<tp:docstring>
+	  error
+	</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="Critical" value="1">
+	<tp:docstring>
+	  criticla
+	</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="Warning" value="2">
+	<tp:docstring>
+	  warning
+	</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="Message" value="3">
+	<tp:docstring>
+	  message
+	</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="Info" value="4">
+	<tp:docstring>
+	  info
+	</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="Debug" value="5">
+	<tp:docstring>
+	  debug
+	</tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+
+  </interface>
+</node>
+<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index e5b1ea1..f179ebc 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -16,7 +16,8 @@ EXTRA_DIST = \
     Tube_Handler.xml \
     Channel_Interface_Tube.xml \
     Channel_Type_DBus_Tube.xml \
-    Channel_Type_Stream_Tube.xml
+    Channel_Type_Stream_Tube.xml \
+    Debug.xml
 
 noinst_LTLIBRARIES = libemp-extensions.la
 
diff --git a/extensions/misc.xml b/extensions/misc.xml
index 5c89ff0..38e802e 100644
--- a/extensions/misc.xml
+++ b/extensions/misc.xml
@@ -9,5 +9,6 @@
 <xi:include href="Channel_Interface_Tube.xml" />
 <xi:include href="Channel_Type_DBus_Tube.xml" />
 <xi:include href="Channel_Type_Stream_Tube.xml" />
+<xi:include href="Debug.xml" />
 
 </tp:spec>
diff --git a/src/Makefile.am b/src/Makefile.am
index 76a5aa7..b776396 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,6 +27,7 @@ empathy_SOURCES =							\
 	empathy-accounts-dialog.c empathy-accounts-dialog.h		\
 	empathy-call-window.c empathy-call-window.h			\
 	empathy-chatrooms-window.c empathy-chatrooms-window.h		\
+	empathy-debug-dialog.c empathy-debug-dialog.h			\
 	empathy-chat-window.c empathy-chat-window.h			\
 	empathy-event-manager.c empathy-event-manager.h			\
 	empathy-ft-manager.c empathy-ft-manager.h			\
diff --git a/src/empathy-debug-dialog.c b/src/empathy-debug-dialog.c
new file mode 100644
index 0000000..694aff2
--- /dev/null
+++ b/src/empathy-debug-dialog.c
@@ -0,0 +1,1107 @@
+/*
+*  Copyright (C) 2009 Collabora Ltd.
+*
+*  This library is free software; you can redistribute it and/or
+*  modify it under the terms of the GNU Lesser General Public
+*  License as published by the Free Software Foundation; either
+*  version 2.1 of the License, or (at your option) any later version.
+*
+*  This library is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*  Lesser General Public License for more details.
+*
+*  You should have received a copy of the GNU Lesser General Public
+*  License along with this library; if not, write to the Free Software
+*  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*
+*  Authors: Jonny Lamb <jonny.lamb@collabora.co.uk>
+*/
+
+#include "config.h"
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include <libempathy/empathy-debug.h>
+#include <libempathy/empathy-utils.h>
+
+#include <libempathy-gtk/empathy-account-chooser.h>
+
+#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/util.h>
+#include <telepathy-glib/proxy-subclass.h>
+
+#include "extensions/extensions.h"
+
+#include "empathy-debug-dialog.h"
+
+G_DEFINE_TYPE (EmpathyDebugDialog, empathy_debug_dialog,
+    GTK_TYPE_DIALOG)
+
+enum
+{
+  COL_DEBUG_TIMESTAMP = 0,
+  COL_DEBUG_DOMAIN,
+  COL_DEBUG_CATEGORY,
+  COL_DEBUG_LEVEL_STRING,
+  COL_DEBUG_MESSAGE,
+  COL_DEBUG_LEVEL_VALUE,
+  NUM_DEBUG_COLS
+};
+
+enum
+{
+  COL_CM_NAME = 0,
+  COL_CM_UNIQUE_NAME,
+  NUM_COLS_CM
+};
+
+enum
+{
+  COL_LEVEL_NAME,
+  COL_LEVEL_VALUE,
+  NUM_COLS_LEVEL
+};
+
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyDebugDialog)
+typedef struct
+{
+  GtkWidget *filter;
+  GtkWidget *view;
+  GtkWidget *cm_chooser;
+  GtkListStore *store;
+  GtkTreeModel *store_filter;
+  TpProxy *proxy;
+  TpProxySignalConnection *signal_connection;
+  TpProxySignalConnection *name_owner_changed_signal;
+  gboolean paused;
+  GtkListStore *cms;
+  gboolean dispose_run;
+} EmpathyDebugDialogPriv;
+
+static const gchar *
+log_level_to_string (guint level)
+{
+  switch (level)
+    {
+    case EMP_DEBUG_LEVEL_ERROR:
+      return _("Error");
+      break;
+    case EMP_DEBUG_LEVEL_CRITICAL:
+      return _("Critical");
+      break;
+    case EMP_DEBUG_LEVEL_WARNING:
+      return _("Warning");
+      break;
+    case EMP_DEBUG_LEVEL_MESSAGE:
+      return _("Message");
+      break;
+    case EMP_DEBUG_LEVEL_INFO:
+      return _("Info");
+      break;
+    case EMP_DEBUG_LEVEL_DEBUG:
+      return _("Debug");
+      break;
+    default:
+      g_assert_not_reached ();
+      break;
+    }
+}
+
+static void
+debug_dialog_add_message (EmpathyDebugDialog *debug_dialog,
+    gdouble timestamp,
+    const gchar *domain_category,
+    guint level,
+    const gchar *message)
+{
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+  gchar *domain, *category;
+  GtkTreeIter iter;
+  gchar *string;
+
+  if (g_strrstr (domain_category, "/"))
+    {
+      gchar **parts = g_strsplit (domain_category, "/", 2);
+      domain = g_strdup (parts[0]);
+      category = g_strdup (parts[1]);
+      g_strfreev (parts);
+    }
+  else
+    {
+      domain = g_strdup (domain_category);
+      category = g_strdup ("");
+    }
+
+  if (g_str_has_suffix (message, "\n"))
+    string = g_strchomp (g_strdup (message));
+  else
+    string = g_strdup (message);
+
+
+  gtk_list_store_append (priv->store, &iter);
+  gtk_list_store_set (priv->store, &iter,
+      COL_DEBUG_TIMESTAMP, timestamp,
+      COL_DEBUG_DOMAIN, domain,
+      COL_DEBUG_CATEGORY, category,
+      COL_DEBUG_LEVEL_STRING, log_level_to_string (level),
+      COL_DEBUG_MESSAGE, string,
+      COL_DEBUG_LEVEL_VALUE, level,
+      -1);
+
+  g_free (string);
+  g_free (domain);
+  g_free (category);
+}
+
+static void
+debug_dialog_new_debug_message_cb (TpProxy *proxy,
+    gdouble timestamp,
+    const gchar *domain,
+    guint level,
+    const gchar *message,
+    gpointer user_data,
+    GObject *weak_object)
+{
+  EmpathyDebugDialog *debug_dialog = (EmpathyDebugDialog *) user_data;
+
+  debug_dialog_add_message (debug_dialog, timestamp, domain, level,
+      message);
+}
+
+static void
+debug_dialog_set_enabled (EmpathyDebugDialog *debug_dialog,
+    gboolean enabled)
+{
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+  GValue *val;
+
+  val = tp_g_value_slice_new_boolean (enabled);
+
+  tp_cli_dbus_properties_call_set (priv->proxy, -1, EMP_IFACE_DEBUG,
+      "Enabled", val, NULL, NULL, NULL, NULL);
+
+  tp_g_value_slice_free (val);
+}
+
+static void
+debug_dialog_get_messages_cb (TpProxy *proxy,
+    const GPtrArray *messages,
+    const GError *error,
+    gpointer user_data,
+    GObject *weak_object)
+{
+  EmpathyDebugDialog *debug_dialog = (EmpathyDebugDialog *) user_data;
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+  gint i;
+
+  if (error != NULL)
+    {
+      DEBUG ("GetMessages failed: %s", error->message);
+      return;
+    }
+
+  for (i = 0; i < messages->len; i++)
+    {
+      GValueArray *values = g_ptr_array_index (messages, i);
+
+      debug_dialog_add_message (debug_dialog,
+          g_value_get_double (g_value_array_get_nth (values, 0)),
+          g_value_get_string (g_value_array_get_nth (values, 1)),
+          g_value_get_uint (g_value_array_get_nth (values, 2)),
+          g_value_get_string (g_value_array_get_nth (values, 3)));
+    }
+
+  /* Connect to NewDebugMessage */
+  priv->signal_connection = emp_cli_debug_connect_to_new_debug_message (
+      proxy, debug_dialog_new_debug_message_cb, debug_dialog,
+      NULL, NULL, NULL);
+
+  /* Set Enabled as appropriate */
+  debug_dialog_set_enabled (debug_dialog, !priv->paused);
+}
+
+static void
+debug_dialog_cm_chooser_changed_cb (GtkComboBox *cm_chooser,
+    EmpathyDebugDialog *debug_dialog)
+{
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+  MissionControl *mc;
+  TpDBusDaemon *dbus;
+  GError *error = NULL;
+  gchar *bus_name;
+  TpConnection *connection;
+  GtkTreeIter iter;
+
+  if (!gtk_combo_box_get_active_iter (cm_chooser, &iter))
+    {
+      DEBUG ("No CM is selected");
+      if (gtk_tree_model_iter_n_children (
+          GTK_TREE_MODEL (priv->cms), NULL) > 0)
+        {
+          gtk_combo_box_set_active (cm_chooser, 0);
+        }
+      return;
+    }
+
+  mc = empathy_mission_control_dup_singleton ();
+  dbus = tp_dbus_daemon_dup (&error);
+
+  if (error != NULL)
+    {
+      DEBUG ("Failed at duping the dbus daemon: %s", error->message);
+      g_object_unref (mc);
+    }
+
+  gtk_tree_model_get (GTK_TREE_MODEL (priv->cms), &iter,
+      COL_CM_UNIQUE_NAME, &bus_name, -1);
+  connection = tp_connection_new (dbus, bus_name, DEBUG_OBJECT_PATH, &error);
+  g_free (bus_name);
+
+  if (error != NULL)
+    {
+      DEBUG ("Getting a new TpConnection failed: %s", error->message);
+      g_error_free (error);
+      g_object_unref (dbus);
+      g_object_unref (mc);
+      return;
+    }
+
+  gtk_list_store_clear (priv->store);
+
+  /* Disable debug signalling */
+  if (priv->proxy != NULL)
+    debug_dialog_set_enabled (debug_dialog, FALSE);
+
+  /* Disconnect from previous NewDebugMessage signal */
+  if (priv->signal_connection != NULL)
+    {
+      tp_proxy_signal_connection_disconnect (priv->signal_connection);
+      priv->signal_connection = NULL;
+    }
+
+  if (priv->proxy != NULL)
+    g_object_unref (priv->proxy);
+
+  priv->proxy = TP_PROXY (connection);
+
+  tp_proxy_add_interface_by_id (priv->proxy, emp_iface_quark_debug ());
+
+  emp_cli_debug_call_get_messages (priv->proxy, -1,
+      debug_dialog_get_messages_cb, debug_dialog, NULL, NULL);
+
+  g_object_unref (dbus);
+  g_object_unref (mc);
+}
+
+typedef struct
+{
+  const gchar *unique_name;
+  gboolean found;
+} CmInModelForeachData;
+
+static gboolean
+debug_dialog_cms_foreach (GtkTreeModel *model,
+    GtkTreePath *path,
+    GtkTreeIter *iter,
+    gpointer user_data)
+{
+  CmInModelForeachData *data = (CmInModelForeachData *) user_data;
+  gchar *unique_name;
+
+  gtk_tree_model_get (model, iter,
+      COL_CM_UNIQUE_NAME, &unique_name,
+      -1);
+
+  if (!tp_strdiff (unique_name, data->unique_name))
+    data->found = TRUE;
+
+  g_free (unique_name);
+
+  return data->found;
+}
+
+static gboolean
+debug_dialog_cm_is_in_model (EmpathyDebugDialog *debug_dialog,
+    const gchar *unique_name)
+{
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+  CmInModelForeachData *data;
+  gboolean found;
+
+  data = g_slice_new0 (CmInModelForeachData);
+  data->unique_name = unique_name;
+  data->found = FALSE;
+
+  gtk_tree_model_foreach (GTK_TREE_MODEL (priv->cms),
+      debug_dialog_cms_foreach, data);
+
+  found = data->found;
+
+  g_slice_free (CmInModelForeachData, data);
+
+  return found;
+}
+
+typedef struct
+{
+  EmpathyDebugDialog *debug_dialog;
+  gchar *cm_name;
+} FillCmChooserData;
+
+static void
+debug_dialog_get_name_owner_cb (TpDBusDaemon *proxy,
+    const gchar *out,
+    const GError *error,
+    gpointer user_data,
+    GObject *weak_object)
+{
+  FillCmChooserData *data = (FillCmChooserData *) user_data;
+  EmpathyDebugDialogPriv *priv = GET_PRIV (data->debug_dialog);
+
+  if (error != NULL)
+    {
+      DEBUG ("GetNameOwner failed: %s", error->message);
+      goto OUT;
+    }
+
+  if (!debug_dialog_cm_is_in_model (data->debug_dialog, out))
+    {
+      GtkTreeIter iter;
+
+      DEBUG ("Adding CM to list: %s at unique name: %s",
+          data->cm_name, out);
+
+      gtk_list_store_append (priv->cms, &iter);
+      gtk_list_store_set (priv->cms, &iter,
+          COL_CM_NAME, data->cm_name,
+          COL_CM_UNIQUE_NAME, out,
+          -1);
+
+      gtk_combo_box_set_active (GTK_COMBO_BOX (priv->cm_chooser), 0);
+    }
+
+OUT:
+  g_free (data->cm_name);
+  g_slice_free (FillCmChooserData, data);
+}
+
+static void
+debug_dialog_list_connection_names_cb (const gchar * const *names,
+    gsize n,
+    const gchar * const *cms,
+    const gchar * const *protocols,
+    const GError *error,
+    gpointer user_data,
+    GObject *weak_object)
+{
+  EmpathyDebugDialog *debug_dialog = (EmpathyDebugDialog *) user_data;
+  guint i;
+  TpDBusDaemon *dbus;
+  GError *error2 = NULL;
+
+  if (error != NULL)
+    {
+      DEBUG ("list_connection_names failed: %s", error->message);
+      return;
+    }
+
+  dbus = tp_dbus_daemon_dup (&error2);
+
+  if (error2 != NULL)
+    {
+      DEBUG ("Failed to dup TpDBusDaemon.");
+      return;
+    }
+
+  for (i = 0; cms[i] != NULL; i++)
+    {
+      FillCmChooserData *data;
+
+      data = g_slice_new0 (FillCmChooserData);
+      data->debug_dialog = debug_dialog;
+      data->cm_name = g_strdup (cms[i]);
+
+      tp_cli_dbus_daemon_call_get_name_owner (dbus, -1,
+          names[i], debug_dialog_get_name_owner_cb,
+          data, NULL, NULL);
+    }
+
+  g_object_unref (dbus);
+}
+
+static gboolean
+debug_dialog_remove_cm_foreach (GtkTreeModel *model,
+    GtkTreePath *path,
+    GtkTreeIter *iter,
+    gpointer user_data)
+{
+  const gchar *unique_name_to_remove = (const gchar *) user_data;
+  gchar *name;
+  gboolean found = FALSE;
+
+  gtk_tree_model_get (model, iter, COL_CM_UNIQUE_NAME, &name, -1);
+
+  if (!tp_strdiff (name, unique_name_to_remove))
+    {
+      found = TRUE;
+      gtk_list_store_remove (GTK_LIST_STORE (model), iter);
+    }
+
+  g_free (name);
+
+  return found;
+}
+
+#define CM_WELL_KNOWN_NAME_PREFIX \
+    "org.freedesktop.Telepathy.ConnectionManager."
+
+static void
+debug_dialog_name_owner_changed_cb (TpDBusDaemon *proxy,
+    const gchar *arg0,
+    const gchar *arg1,
+    const gchar *arg2,
+    gpointer user_data,
+    GObject *weak_object)
+{
+  EmpathyDebugDialogPriv *priv = GET_PRIV (user_data);
+
+  /* Wow, I hate all of this code... */
+  if (!g_str_has_prefix (arg0, CM_WELL_KNOWN_NAME_PREFIX))
+    return;
+
+  if (EMP_STR_EMPTY (arg1) && !EMP_STR_EMPTY (arg2))
+    {
+      /* A connection manager joined -- because it's guaranteed
+       * that the CM just joined (because o.fd.Tp.CM.foo
+       * just joined), we don't need to check whether the unique
+       * name is in the CM model. Hooray.
+       */
+      GtkTreeIter iter;
+      const gchar *name = arg0 + strlen (CM_WELL_KNOWN_NAME_PREFIX);
+
+      DEBUG ("Adding new CM '%s' at %s.", name, arg2);
+
+      gtk_list_store_append (priv->cms, &iter);
+      gtk_list_store_set (priv->cms, &iter,
+          COL_CM_NAME, name,
+          COL_CM_UNIQUE_NAME, arg2,
+          -1);
+    }
+  else if (!EMP_STR_EMPTY (arg1) && EMP_STR_EMPTY (arg2))
+    {
+      /* A connection manager died -- because it's guaranteed
+       * that the CM itself just died (because o.fd.Tp.CM.foo
+       * just died), we don't need to check that it was already
+       * in the model.
+       */
+      gchar *to_remove;
+
+      /* Can't pass a const into a GtkTreeModelForeachFunc. */
+      to_remove = g_strdup (arg1);
+
+      DEBUG ("Removing CM from %s.", to_remove);
+
+      gtk_tree_model_foreach (GTK_TREE_MODEL (priv->cms),
+          debug_dialog_remove_cm_foreach, to_remove);
+
+      g_free (to_remove);
+    }
+}
+
+static void
+debug_dialog_fill_cm_chooser (EmpathyDebugDialog *debug_dialog)
+{
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+  TpDBusDaemon *dbus;
+  GError *error = NULL;
+
+  dbus = tp_dbus_daemon_dup (&error);
+
+  if (error != NULL)
+    {
+      DEBUG ("Failed to dup dbus daemon: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  tp_list_connection_names (dbus, debug_dialog_list_connection_names_cb,
+      debug_dialog, NULL, NULL);
+
+  priv->name_owner_changed_signal =
+      tp_cli_dbus_daemon_connect_to_name_owner_changed (dbus,
+      debug_dialog_name_owner_changed_cb, debug_dialog, NULL, NULL, NULL);
+
+  g_object_unref (dbus);
+}
+
+static void
+debug_dialog_pause_toggled_cb (GtkToggleToolButton *pause,
+    EmpathyDebugDialog *debug_dialog)
+{
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+
+  priv->paused = gtk_toggle_tool_button_get_active (pause);
+
+  debug_dialog_set_enabled (debug_dialog, !priv->paused);
+}
+
+static gboolean
+debug_dialog_visible_func (GtkTreeModel *model,
+    GtkTreeIter *iter,
+    gpointer user_data)
+{
+  EmpathyDebugDialog *debug_dialog = (EmpathyDebugDialog *) user_data;
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+  guint filter_value, level;
+  GtkTreeModel *filter_model;
+  GtkTreeIter filter_iter;
+
+  filter_model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->filter));
+  gtk_combo_box_get_active_iter (GTK_COMBO_BOX (priv->filter),
+      &filter_iter);
+
+  gtk_tree_model_get (model, iter, COL_DEBUG_LEVEL_VALUE, &level, -1);
+  gtk_tree_model_get (filter_model, &filter_iter,
+      COL_LEVEL_VALUE, &filter_value, -1);
+
+  if (level <= filter_value)
+    return TRUE;
+
+  return FALSE;
+}
+
+static void
+debug_dialog_filter_changed_cb (GtkComboBox *filter,
+    EmpathyDebugDialog *debug_dialog)
+{
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+
+  gtk_tree_model_filter_refilter (
+      GTK_TREE_MODEL_FILTER (priv->store_filter));
+}
+
+static void
+debug_dialog_clear_clicked_cb (GtkToolButton *clear_button,
+    EmpathyDebugDialog *debug_dialog)
+{
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+
+  gtk_list_store_clear (priv->store);
+}
+
+static void
+debug_dialog_menu_copy_activate_cb (GtkMenuItem *menu_item,
+    EmpathyDebugDialog *debug_dialog)
+{
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+  GtkTreePath *path;
+  GtkTreeViewColumn *focus_column;
+  GtkTreeIter iter;
+  gchar *message;
+  GtkClipboard *clipboard;
+
+  gtk_tree_view_get_cursor (GTK_TREE_VIEW (priv->view),
+      &path, &focus_column);
+
+  if (path == NULL)
+    {
+      DEBUG ("No row is in focus");
+      return;
+    }
+
+  gtk_tree_model_get_iter (priv->store_filter, &iter, path);
+
+  gtk_tree_model_get (priv->store_filter, &iter,
+      COL_DEBUG_MESSAGE, &message,
+      -1);
+
+  if (EMP_STR_EMPTY (message))
+    {
+      DEBUG ("Log message is empty");
+      return;
+    }
+
+  clipboard = gtk_clipboard_get_for_display (
+      gtk_widget_get_display (GTK_WIDGET (menu_item)),
+      GDK_SELECTION_CLIPBOARD);
+
+  gtk_clipboard_set_text (clipboard, message, -1);
+
+  g_free (message);
+}
+
+typedef struct
+{
+  EmpathyDebugDialog *debug_dialog;
+  guint button;
+  guint32 time;
+} MenuPopupData;
+
+static gboolean
+debug_dialog_show_menu (gpointer user_data)
+{
+  MenuPopupData *data = (MenuPopupData *) user_data;
+  GtkWidget *menu, *item;
+  GtkMenuShell *shell;
+
+  menu = gtk_menu_new ();
+  shell = GTK_MENU_SHELL (menu);
+
+  item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL);
+
+  g_signal_connect (item, "activate",
+      G_CALLBACK (debug_dialog_menu_copy_activate_cb), data->debug_dialog);
+
+  gtk_menu_shell_append (shell, item);
+  gtk_widget_show (item);
+
+  gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
+     data->button, data->time);
+
+  g_slice_free (MenuPopupData, user_data);
+
+  return FALSE;
+}
+
+static gboolean
+debug_dialog_button_press_event_cb (GtkTreeView *view,
+    GdkEventButton *event,
+    gpointer user_data)
+{
+  /* A mouse button was pressed on the tree view. */
+
+  if (event->button == 3)
+    {
+      /* The tree view was right-clicked. (3 == third mouse button) */
+      MenuPopupData *data;
+      data = g_slice_new0 (MenuPopupData);
+      data->debug_dialog = user_data;
+      data->button = event->button;
+      data->time = event->time;
+      g_idle_add (debug_dialog_show_menu, data);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+debug_dialog_store_filter_foreach (GtkTreeModel *model,
+    GtkTreePath *path,
+    GtkTreeIter *iter,
+    gpointer user_data)
+{
+  GFileOutputStream *output_stream = (GFileOutputStream *) user_data;
+  gchar *domain, *category, *message, *level_str, *level_upper;
+  gdouble timestamp;
+  gchar *line;
+  GError *error = NULL;
+  gboolean out = FALSE;
+
+  gtk_tree_model_get (model, iter,
+      COL_DEBUG_TIMESTAMP, &timestamp,
+      COL_DEBUG_DOMAIN, &domain,
+      COL_DEBUG_CATEGORY, &category,
+      COL_DEBUG_LEVEL_STRING, &level_str,
+      COL_DEBUG_MESSAGE, &message,
+      -1);
+
+  level_upper = g_ascii_strup (level_str, -1);
+
+  line = g_strdup_printf ("%s%s%s-%s: %e: %s\n",
+      domain, EMP_STR_EMPTY (category) ? "" : "/",
+      category, level_upper, timestamp, message);
+
+  g_output_stream_write (G_OUTPUT_STREAM (output_stream), line,
+      strlen (line), NULL, &error);
+
+  if (error != NULL)
+    {
+      DEBUG ("Failed to write to file: %s", error->message);
+      g_error_free (error);
+      out = TRUE;
+    }
+
+  g_free (line);
+  g_free (level_upper);
+  g_free (level_str);
+  g_free (domain);
+  g_free (category);
+  g_free (message);
+
+  return out;
+}
+
+static void
+debug_dialog_save_file_chooser_response_cb (GtkDialog *dialog,
+    gint response_id,
+    EmpathyDebugDialog *debug_dialog)
+{
+  EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+  gchar *filename = NULL;
+  GFile *gfile = NULL;
+  GFileOutputStream *output_stream = NULL;
+  GError *error = NULL;
+
+  if (response_id != GTK_RESPONSE_ACCEPT)
+    goto OUT;
+
+  filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+
+  DEBUG ("Saving log as %s", filename);
+
+  gfile = g_file_new_for_path (filename);
+  output_stream = g_file_replace (gfile, NULL, FALSE,
+      G_FILE_CREATE_NONE, NULL, &error);
+
+  if (error != NULL)
+    {
+      DEBUG ("Failed to open file for writing: %s", error->message);
+      g_error_free (error);
+      goto OUT;
+    }
+
+  gtk_tree_model_foreach (priv->store_filter,
+      debug_dialog_store_filter_foreach, output_stream);
+
+OUT:
+  if (gfile != NULL)
+    g_object_unref (gfile);
+
+  if (output_stream != NULL)
+    g_object_unref (output_stream);
+
+  if (filename != NULL)
+    g_free (filename);
+
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+debug_dialog_save_clicked_cb (GtkToolButton *tool_button,
+    EmpathyDebugDialog *debug_dialog)
+{
+  GtkWidget *file_chooser;
+
+  file_chooser = gtk_file_chooser_dialog_new (_("Save"),
+      GTK_WINDOW (debug_dialog), GTK_FILE_CHOOSER_ACTION_SAVE,
+      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+      GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+      NULL);
+
+  gtk_window_set_modal (GTK_WINDOW (file_chooser), TRUE);
+  gtk_file_chooser_set_do_overwrite_confirmation (
+      GTK_FILE_CHOOSER (file_chooser), TRUE);
+
+  g_signal_connect (file_chooser, "response",
+      G_CALLBACK (debug_dialog_save_file_chooser_response_cb),
+      debug_dialog);
+
+  gtk_widget_show (file_chooser);
+}
+
+static GObject *
+debug_dialog_constructor (GType type,
+    guint n_construct_params,
+    GObjectConstructParam *construct_params)
+{
+  GObject *object;
+  EmpathyDebugDialogPriv *priv;
+  GtkWidget *vbox;
+  GtkWidget *toolbar;
+  GtkWidget *image;
+  GtkWidget *label;
+  GtkToolItem *item;
+  GtkCellRenderer *renderer;
+  GtkWidget *scrolled_win;
+  GtkListStore *level_store;
+  GtkTreeIter iter;
+
+  object = G_OBJECT_CLASS (empathy_debug_dialog_parent_class)->constructor
+    (type, n_construct_params, construct_params);
+  priv = GET_PRIV (object);
+
+  gtk_window_set_title (GTK_WINDOW (object), _("Debug Window"));
+  gtk_window_set_default_size (GTK_WINDOW (object), 800, 400);
+
+  vbox = GTK_DIALOG (object)->vbox;
+
+  toolbar = gtk_toolbar_new ();
+  gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
+  gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), TRUE);
+  gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar),
+      GTK_ICON_SIZE_SMALL_TOOLBAR);
+  gtk_widget_show (toolbar);
+
+  gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 0);
+
+  /* CM */
+  priv->cm_chooser = gtk_combo_box_new_text ();
+  priv->cms = gtk_list_store_new (NUM_COLS_CM, G_TYPE_STRING, G_TYPE_STRING);
+  gtk_combo_box_set_model (GTK_COMBO_BOX (priv->cm_chooser),
+      GTK_TREE_MODEL (priv->cms));
+  gtk_widget_show (priv->cm_chooser);
+
+  item = gtk_tool_item_new ();
+  gtk_widget_show (GTK_WIDGET (item));
+  gtk_container_add (GTK_CONTAINER (item), priv->cm_chooser);
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+  debug_dialog_fill_cm_chooser (EMPATHY_DEBUG_DIALOG (object));
+  g_signal_connect (priv->cm_chooser, "changed",
+      G_CALLBACK (debug_dialog_cm_chooser_changed_cb), object);
+  gtk_widget_show (GTK_WIDGET (priv->cm_chooser));
+
+  item = gtk_separator_tool_item_new ();
+  gtk_widget_show (GTK_WIDGET (item));
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+  /* Save */
+  item = gtk_tool_button_new_from_stock (GTK_STOCK_SAVE);
+  g_signal_connect (item, "clicked",
+      G_CALLBACK (debug_dialog_save_clicked_cb), object);
+  gtk_widget_show (GTK_WIDGET (item));
+  gtk_tool_item_set_is_important (GTK_TOOL_ITEM (item), TRUE);
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+  /* Clear */
+  item = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR);
+  g_signal_connect (item, "clicked",
+      G_CALLBACK (debug_dialog_clear_clicked_cb), object);
+  gtk_widget_show (GTK_WIDGET (item));
+  gtk_tool_item_set_is_important (GTK_TOOL_ITEM (item), TRUE);
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+  item = gtk_separator_tool_item_new ();
+  gtk_widget_show (GTK_WIDGET (item));
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+  /* Pause */
+  priv->paused = FALSE;
+  image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PAUSE,
+      GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image);
+  item = gtk_toggle_tool_button_new ();
+  gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (item),
+      priv->paused);
+  g_signal_connect (item, "toggled",
+      G_CALLBACK (debug_dialog_pause_toggled_cb), object);
+  gtk_widget_show (GTK_WIDGET (item));
+  gtk_tool_item_set_is_important (GTK_TOOL_ITEM (item), TRUE);
+  gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), _("Pause"));
+  gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (item), image);
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+  item = gtk_separator_tool_item_new ();
+  gtk_widget_show (GTK_WIDGET (item));
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+  /* Level */
+  item = gtk_tool_item_new ();
+  gtk_widget_show (GTK_WIDGET (item));
+  label = gtk_label_new (_("Level "));
+  gtk_widget_show (label);
+  gtk_container_add (GTK_CONTAINER (item), label);
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+  priv->filter = gtk_combo_box_new_text ();
+  gtk_widget_show (priv->filter);
+
+  item = gtk_tool_item_new ();
+  gtk_widget_show (GTK_WIDGET (item));
+  gtk_container_add (GTK_CONTAINER (item), priv->filter);
+  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+
+  level_store = gtk_list_store_new (NUM_COLS_LEVEL,
+      G_TYPE_STRING, G_TYPE_UINT);
+  gtk_combo_box_set_model (GTK_COMBO_BOX (priv->filter),
+      GTK_TREE_MODEL (level_store));
+
+  gtk_list_store_append (level_store, &iter);
+  gtk_list_store_set (level_store, &iter,
+      COL_LEVEL_NAME, _("Debug"),
+      COL_LEVEL_VALUE, EMP_DEBUG_LEVEL_DEBUG,
+      -1);
+
+  gtk_list_store_append (level_store, &iter);
+  gtk_list_store_set (level_store, &iter,
+      COL_LEVEL_NAME, _("Info"),
+      COL_LEVEL_VALUE, EMP_DEBUG_LEVEL_INFO,
+      -1);
+
+  gtk_list_store_append (level_store, &iter);
+  gtk_list_store_set (level_store, &iter,
+      COL_LEVEL_NAME, _("Message"),
+      COL_LEVEL_VALUE, EMP_DEBUG_LEVEL_MESSAGE,
+      -1);
+
+  gtk_list_store_append (level_store, &iter);
+  gtk_list_store_set (level_store, &iter,
+      COL_LEVEL_NAME, _("Warning"),
+      COL_LEVEL_VALUE, EMP_DEBUG_LEVEL_WARNING,
+      -1);
+
+  gtk_list_store_append (level_store, &iter);
+  gtk_list_store_set (level_store, &iter,
+      COL_LEVEL_NAME, _("Critical"),
+      COL_LEVEL_VALUE, EMP_DEBUG_LEVEL_CRITICAL,
+      -1);
+
+  gtk_list_store_append (level_store, &iter);
+  gtk_list_store_set (level_store, &iter,
+      COL_LEVEL_NAME, _("Error"),
+      COL_LEVEL_VALUE, EMP_DEBUG_LEVEL_ERROR,
+      -1);
+
+  gtk_combo_box_set_active (GTK_COMBO_BOX (priv->filter), 0);
+  g_signal_connect (priv->filter, "changed",
+      G_CALLBACK (debug_dialog_filter_changed_cb), object);
+
+  /* Debug treeview */
+  priv->view = gtk_tree_view_new ();
+  gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (priv->view), TRUE);
+
+  g_signal_connect (priv->view, "button-press-event",
+      G_CALLBACK (debug_dialog_button_press_event_cb), object);
+
+  renderer = gtk_cell_renderer_text_new ();
+  g_object_set (renderer, "yalign", 0, NULL);
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->view),
+      -1, _("Time"), renderer, "text", COL_DEBUG_TIMESTAMP, NULL);
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->view),
+      -1, _("Domain"), renderer, "text", COL_DEBUG_DOMAIN, NULL);
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->view),
+      -1, _("Category"), renderer, "text", COL_DEBUG_CATEGORY, NULL);
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->view),
+      -1, _("Level"), renderer, "text", COL_DEBUG_LEVEL_STRING, NULL);
+
+  renderer = gtk_cell_renderer_text_new ();
+  g_object_set (renderer, "family", "Monospace", NULL);
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->view),
+      -1, _("Message"), renderer, "text", COL_DEBUG_MESSAGE, NULL);
+
+  priv->store = gtk_list_store_new (NUM_DEBUG_COLS, G_TYPE_DOUBLE,
+      G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+      G_TYPE_UINT);
+
+  priv->store_filter = gtk_tree_model_filter_new (
+      GTK_TREE_MODEL (priv->store), NULL);
+
+  gtk_tree_model_filter_set_visible_func (
+      GTK_TREE_MODEL_FILTER (priv->store_filter),
+      debug_dialog_visible_func, object, NULL);
+
+  gtk_tree_view_set_model (GTK_TREE_VIEW (priv->view), priv->store_filter);
+
+  /* Scrolled window */
+  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
+      GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+  gtk_widget_show (priv->view);
+  gtk_container_add (GTK_CONTAINER (scrolled_win), priv->view);
+
+  gtk_widget_show (scrolled_win);
+  gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE, TRUE, 0);
+
+  gtk_widget_show (GTK_WIDGET (object));
+
+  return object;
+}
+
+static void
+empathy_debug_dialog_init (EmpathyDebugDialog *empathy_debug_dialog)
+{
+  EmpathyDebugDialogPriv *priv =
+      G_TYPE_INSTANCE_GET_PRIVATE (empathy_debug_dialog,
+      EMPATHY_TYPE_DEBUG_DIALOG, EmpathyDebugDialogPriv);
+
+  empathy_debug_dialog->priv = priv;
+
+  priv->dispose_run = FALSE;
+}
+
+static void
+debug_dialog_set_property (GObject *object,
+    guint prop_id,
+    const GValue *value,
+    GParamSpec *pspec)
+{
+  switch (prop_id)
+    {
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
+static void
+debug_dialog_get_property (GObject *object,
+    guint prop_id,
+    GValue *value,
+    GParamSpec *pspec)
+{
+  switch (prop_id)
+    {
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
+static void
+debug_dialog_dispose (GObject *object)
+{
+  EmpathyDebugDialog *selector = EMPATHY_DEBUG_DIALOG (object);
+  EmpathyDebugDialogPriv *priv = GET_PRIV (selector);
+
+  if (priv->dispose_run)
+    return;
+
+  priv->dispose_run = TRUE;
+
+  if (priv->store != NULL)
+    g_object_unref (priv->store);
+
+  if (priv->name_owner_changed_signal != NULL)
+    tp_proxy_signal_connection_disconnect (priv->name_owner_changed_signal);
+
+  if (priv->proxy != NULL)
+    {
+      debug_dialog_set_enabled (EMPATHY_DEBUG_DIALOG (object), FALSE);
+      g_object_unref (priv->proxy);
+    }
+
+  if (priv->signal_connection != NULL)
+    tp_proxy_signal_connection_disconnect (priv->signal_connection);
+
+  if (priv->cms != NULL)
+    g_object_unref (priv->cms);
+
+  (G_OBJECT_CLASS (empathy_debug_dialog_parent_class)->dispose) (object);
+}
+
+static void
+empathy_debug_dialog_class_init (EmpathyDebugDialogClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  object_class->constructor = debug_dialog_constructor;
+  object_class->dispose = debug_dialog_dispose;
+  object_class->set_property = debug_dialog_set_property;
+  object_class->get_property = debug_dialog_get_property;
+  g_type_class_add_private (klass, sizeof (EmpathyDebugDialogPriv));
+}
+
+/* public methods */
+
+GtkWidget *
+empathy_debug_dialog_new (GtkWindow *parent)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
+
+  return GTK_WIDGET (g_object_new (EMPATHY_TYPE_DEBUG_DIALOG,
+      "transient-for", parent, NULL));
+}
diff --git a/src/empathy-debug-dialog.h b/src/empathy-debug-dialog.h
new file mode 100644
index 0000000..5d98fa0
--- /dev/null
+++ b/src/empathy-debug-dialog.h
@@ -0,0 +1,63 @@
+/*
+*  Copyright (C) 2009 Collabora Ltd.
+*
+*  This library is free software; you can redistribute it and/or
+*  modify it under the terms of the GNU Lesser General Public
+*  License as published by the Free Software Foundation; either
+*  version 2.1 of the License, or (at your option) any later version.
+*
+*  This library is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*  Lesser General Public License for more details.
+*
+*  You should have received a copy of the GNU Lesser General Public
+*  License along with this library; if not, write to the Free Software
+*  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*
+*  Authors: Jonny Lamb <jonny.lamb@collabora.co.uk>
+*/
+
+#ifndef __EMPATHY_DEBUG_DIALOG_H__
+#define __EMPATHY_DEBUG_DIALOG_H__
+
+G_BEGIN_DECLS
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#define EMPATHY_TYPE_DEBUG_DIALOG (empathy_debug_dialog_get_type ())
+#define EMPATHY_DEBUG_DIALOG(object) (G_TYPE_CHECK_INSTANCE_CAST \
+        ((object), EMPATHY_TYPE_DEBUG_DIALOG, EmpathyDebugDialog))
+#define EMPATHY_DEBUG_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
+        EMPATHY_TYPE_DEBUG_DIALOG, EmpathyDebugDialogClass))
+#define EMPATHY_IS_DEBUG_DIALOG(object) (G_TYPE_CHECK_INSTANCE_TYPE \
+    ((object), EMPATHY_TYPE_DEBUG_DIALOG))
+#define EMPATHY_IS_DEBUG_DIALOG_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_DEBUG_DIALOG))
+#define EMPATHY_DEBUG_DIALOG_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS \
+    ((object), EMPATHY_TYPE_DEBUG_DIALOG, EmpathyDebugDialogClass))
+
+#define DEBUG_OBJECT_PATH "/org/freedesktop/Telepathy/debug"
+
+typedef struct _EmpathyDebugDialog EmpathyDebugDialog;
+typedef struct _EmpathyDebugDialogClass EmpathyDebugDialogClass;
+
+struct _EmpathyDebugDialog
+{
+  GtkDialog parent;
+  gpointer priv;
+};
+
+struct _EmpathyDebugDialogClass
+{
+  GtkDialogClass parent_class;
+};
+
+GType empathy_debug_dialog_get_type (void) G_GNUC_CONST;
+
+GtkWidget * empathy_debug_dialog_new (GtkWindow *parent);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_DEBUG_DIALOG_H__ */
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index b9993a8..9015a5d 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -55,6 +55,7 @@
 #include "ephy-spinner.h"
 #include "empathy-preferences.h"
 #include "empathy-about-dialog.h"
+#include "empathy-debug-dialog.h"
 #include "empathy-new-chatroom-dialog.h"
 #include "empathy-chatrooms-window.h"
 #include "empathy-event-manager.h"
@@ -921,6 +922,13 @@ main_window_help_about_cb (GtkAction         *action,
 }
 
 static void
+main_window_help_debug_cb (GtkAction         *action,
+			   EmpathyMainWindow *window)
+{
+	empathy_debug_dialog_new (GTK_WINDOW (window->window));
+}
+
+static void
 main_window_help_contents_cb (GtkAction         *action,
 			      EmpathyMainWindow *window)
 {
@@ -1128,6 +1136,7 @@ empathy_main_window_show (void)
 			      "edit_personal_information", "activate", main_window_edit_personal_information_cb,
 			      "edit_preferences", "activate", main_window_edit_preferences_cb,
 			      "help_about", "activate", main_window_help_about_cb,
+			      "help_debug", "activate", main_window_help_debug_cb,
 			      "help_contents", "activate", main_window_help_contents_cb,
 			      NULL);
 
diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index cd45bc7..73b49a5 100644
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -120,6 +120,12 @@
           <accelerator key="F1" modifiers=""/>
         </child>
         <child>
+          <object class="GtkAction" id="help_debug">
+            <property name="name">help_debug</property>
+            <property name="label" translatable="yes">_Debug</property>
+          </object>
+        </child>
+        <child>
           <object class="GtkAction" id="help_about">
             <property name="stock_id">gtk-about</property>
             <property name="name">help_about</property>
@@ -156,6 +162,7 @@
         </menu>
         <menu action="help">
           <menuitem action="help_contents"/>
+          <menuitem action="help_debug"/>
           <menuitem action="help_about"/>
         </menu>
       </menubar>
