  
     key.data = cmd->data.list[0];
 diff --git a/gmetad/data_thread.c b/gmetad/data_thread.c
-index e5707d7..ab54e14 100644
+index 55818fa..a9dc57d 100644
 --- a/gmetad/data_thread.c
 +++ b/gmetad/data_thread.c
+@@ -24,7 +24,7 @@ data_thread ( void *arg )
+ {
+    int i, bytes_read, rval;
+    data_source_list_t *d = (data_source_list_t *)arg;
+-   g_inet_addr *addr;
++   g_inet6_addr *addr;
+    g_tcp_socket *sock=0;
+    datum_t key;
+    char *buf;
 @@ -68,7 +68,7 @@ data_thread ( void *arg )
           
           /* If we successfully read from a good data source last time then try the same host again first. */

 
    fprintf(stderr,"Source: [%s, step %d] has %d sources\n",
       (char*) key->data, d->step, d->num_sources);
@@ -511,12 +511,12 @@ main ( int argc, char *argv[] )
       {
          if (!strcmp(c->riemann_protocol, "udp"))
             {

diff --git a/gmetad/conf.c.in b/gmetad/conf.c.in
index 8ed3cfd..886a091 100644
--- a/gmetad/conf.c.in
+++ b/gmetad/conf.c.in
@@ -77,12 +77,13 @@ static DOTCONF_CB(cb_data_source)
