diff --git a/SaslSignonAuth.client b/SaslSignonAuth.client
new file mode 100644
index 0000000..ba7675f
--- /dev/null
+++ b/SaslSignonAuth.client
@@ -0,0 +1,13 @@
+[org.freedesktop.Telepathy.Client]
+Interfaces=org.freedesktop.Telepathy.Client.Handler;org.freedesktop.Telepathy.Client.Observer
+
+[org.freedesktop.Telepathy.Client.Observer]
+DelayApprovers=true
+
+[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerAuthentication
+org.freedesktop.Telepathy.Channel.Type.ServerAuthentication.AuthenticationMethod s=org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication
+
+[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 0]
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerAuthentication
+org.freedesktop.Telepathy.Channel.Type.ServerAuthentication.AuthenticationMethod s=org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication
diff --git a/empathy-auth-factory.c b/empathy-auth-factory.c
index eeedcac..427f24b 100644
--- a/empathy-auth-factory.c
+++ b/empathy-auth-factory.c
@@ -648,6 +648,7 @@ empathy_auth_factory_constructed (GObject *obj)
   tp_base_client_set_handler_bypass_approval (client, FALSE);
 
   /* Handle ServerTLSConnection and ServerAuthentication channels */
+#if 0
   tp_base_client_take_handler_filter (client, tp_asv_new (
           /* ChannelType */
           TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
@@ -655,6 +656,7 @@ empathy_auth_factory_constructed (GObject *obj)
           /* AuthenticationMethod */
           TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
           TP_HANDLE_TYPE_NONE, NULL));
+#endif
 
   tp_base_client_take_handler_filter (client, tp_asv_new (
           /* ChannelType */
@@ -757,7 +759,7 @@ empathy_auth_factory_new (TpSimpleClientFactory *factory)
 {
   return g_object_new (EMPATHY_TYPE_AUTH_FACTORY,
       "factory", factory,
-      "name", "Empathy.Auth",
+      "name", "SaslSignonAuth",
       NULL);
 }
 
diff --git a/org.freedesktop.Telepathy.Client.SaslSignonAuth.service b/org.freedesktop.Telepathy.Client.SaslSignonAuth.service
new file mode 100644
index 0000000..791977e
--- /dev/null
+++ b/org.freedesktop.Telepathy.Client.SaslSignonAuth.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.SaslSignonAuth
+Exec=/usr/libexec/telepathy-sasl-client
diff --git a/telepathy-sasl-client b/telepathy-sasl-client
deleted file mode 100755
index d91451e..0000000
Binary files a/telepathy-sasl-client and /dev/null differ
diff --git a/telepathy-sasl-client.pro b/telepathy-sasl-client.pro
index af7e2c4..9eeb08a 100644
--- a/telepathy-sasl-client.pro
+++ b/telepathy-sasl-client.pro
@@ -11,3 +11,13 @@ SOURCES += empathy-auth-client.c \
     empathy-uoa-utils.c \
     empathy-sasl-mechanisms.c
 
+target.path = /usr/libexec/
+
+service.files = org.freedesktop.Telepathy.Client.SaslSignonAuth.service
+service.path = /usr/share/dbus-1/services/
+
+client.files = SaslSignonAuth.client
+client.path = /usr/share/telepathy/clients/
+
+INSTALLS += target service client
+