diff --git a/eldbus/Makefile.am b/eldbus/Makefile.am
index 1ec9d348..e0c79b37 100644
--- a/eldbus/Makefile.am
+++ b/eldbus/Makefile.am
@@ -28,7 +28,8 @@ complex-types-server.c \
 server.c \
 client.c \
 simple-signal-emit.c \
-complex-types-client-eina-value.c
+complex-types-client-eina-value.c \
+connect-address.c
 
 EXTRA_PROGRAMS = \
 connman-list-services \
@@ -39,7 +40,8 @@ complex-types-server \
 server \
 client \
 simple-signal-emit \
-complex-types-client-eina-value
+complex-types-client-eina-value \
+connect-address
 
 connman_list_services_SOURCES = connman-list-services.c
 connman_list_services_LDADD = $(EXAMPLES_LIBS)
@@ -68,6 +70,9 @@ simple_signal_emit_LDADD = $(EXAMPLES_LIBS)
 complex_types_client_eina_value_SOURCES = complex-types-client-eina-value.c
 complex_types_client_eina_value_LDADD = $(EXAMPLES_LIBS)
 
+connect_address_SOURCES = connect-address.c
+connect_address_LDADD = $(EXAMPLES_LIBS)
+
 DATA_FILES = Makefile.examples
 
 EXTRA_DIST = $(DATA_FILES)
diff --git a/unsorted/eldbus/Makefile.examples b/unsorted/eldbus/Makefile.examples
index 32d0d938..c6d24062 100644
--- a/unsorted/eldbus/Makefile.examples
+++ b/unsorted/eldbus/Makefile.examples
@@ -8,7 +8,8 @@ EXAMPLES= banshee client \
           connman-list-services \
           ofono-dial \
           server \
-          simple-signal-emit 
+          simple-signal-emit \
+          connect-address
 
 all: examples
 examples: $(EXAMPLES)
diff --git a/unsorted/eldbus/connect-address.c b/unsorted/eldbus/connect-address.c
new file mode 100644
index 00000000..11858f4e
--- /dev/null
+++ b/unsorted/eldbus/connect-address.c
@@ -0,0 +1,100 @@
+//Compile with:
+// gcc -o client client.c `pkg-config --cflags --libs eldbus ecore eina`
+
+#include <stdlib.h>
+
+#include "Eldbus.h"
+#include <Ecore.h>
+
+#define BUS "org.freedesktop.IBus"
+#define PATH "/org/freedesktop/IBus"
+#define INTERFACE "org.freedesktop.IBus"
+
+static int _client_log_dom = -1;
+#define ERR(...)      EINA_LOG_DOM_ERR(_client_log_dom, __VA_ARGS__)
+
+static void
+_on_registry_changed(void *context EINA_UNUSED, const Eldbus_Message *msg EINA_UNUSED)
+{
+   printf("RegistryChanged\n\n");
+}
+
+static void
+_on_global_engine_changed(void *context EINA_UNUSED, const Eldbus_Message *msg)
+{
+   const char *txt;
+   if (eldbus_message_arguments_get(msg, "s", &txt))
+     printf("GlobalEngineChanged %s\n", txt);
+}
+
+static void
+on_name_owner_changed(void *data EINA_UNUSED, const char *bus, const char *old_id, const char *new_id EINA_UNUSED)
+{
+   printf("Bus=%s | old=%s | new=%s\n", bus, old_id, new_id);
+}
+
+static Eina_Bool
+finish(void *data EINA_UNUSED)
+{
+   ecore_main_loop_quit();
+   return ECORE_CALLBACK_CANCEL;
+}
+
+int
+main(void)
+{
+   Eldbus_Connection *conn;
+   Eldbus_Object *obj;
+   Eldbus_Proxy *proxy;
+   const char *address;
+
+   eina_init();
+   _client_log_dom = eina_log_domain_register("connect_address", EINA_COLOR_CYAN);
+   if (_client_log_dom < 0)
+     {
+        EINA_LOG_ERR("Unable to create 'client' log domain");
+        goto exit_eina;
+     }
+
+   if (!(address = getenv("IBUS_ADDRESS")))
+     {
+        ERR("IBUS_ADDRESS environment variable must be set");
+        goto exit_eina;
+     }
+
+   ecore_init();
+   eldbus_init();
+
+   printf("Connecting to %s\n", address);
+   conn = eldbus_address_connection_get(address);
+
+   if (!conn)
+     {
+        ERR("Failed to get dbus connection to address '%s'", address);
+        goto end;
+     }
+
+   printf("CONNECTED!!!\n");
+   obj = eldbus_object_get(conn, BUS, PATH);
+   proxy = eldbus_proxy_get(obj, INTERFACE);
+   eldbus_proxy_signal_handler_add(proxy, "RegistryChanged", _on_registry_changed, NULL);
+   eldbus_proxy_signal_handler_add(proxy, "GlobalEngineChanged", _on_global_engine_changed, NULL);
+
+   eldbus_name_owner_changed_callback_add(conn, BUS, on_name_owner_changed,
+                                         conn, EINA_TRUE);
+   ecore_timer_add(30, finish, NULL);
+
+   ecore_main_loop_begin();
+
+   eldbus_connection_unref(conn);
+
+end:
+   eldbus_shutdown();
+   ecore_shutdown();
+
+   eina_log_domain_unregister(_client_log_dom);
+exit_eina:
+   eina_shutdown();
+
+   return 0;
+}