2 files changed, 5 insertions, 3 deletions

diff --git a/contrib/gnunet-gns-import.sh b/contrib/gnunet-gns-import.sh
index dacdf7887..502aeb9d8 100755
--- a/contrib/gnunet-gns-import.sh
+++ b/contrib/gnunet-gns-import.sh
@@ -31,6 +31,7 @@ gnunet-identity -C sks-zone $options
 # Integrate those with the respective subsystems.
 gnunet-identity -e short-zone -s gns-short $options
 gnunet-identity -e master-zone -s gns-master $options
+gnunet-identity -e master-zone -s gns-proxy $options
 gnunet-identity -e private-zone -s gns-private $options
 gnunet-identity -e sks-zone -s fs-sks $options
 
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 8bb299c6f..2508ae68c 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -2647,14 +2647,15 @@ identity_master_cb (void *cls,
   if (NULL == ego)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("No ego configured for `master-zone`\n"));
+                _("No ego configured for `%s`\n"),
+                "gns-proxy");
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
   GNUNET_IDENTITY_ego_get_public_key (ego,
                                       &local_gns_zone);
   id_op = GNUNET_IDENTITY_get (identity,
-                               "shorten-zone",
+                               "gns-short",
                                &identity_shorten_cb,
                                NULL);
 }
@@ -2728,7 +2729,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   identity = GNUNET_IDENTITY_connect (cfg,
                                       NULL, NULL);  
   id_op = GNUNET_IDENTITY_get (identity,
-                               "master-zone",
+                               "gns-proxy",
                                &identity_master_cb,
                                NULL);  
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,