diff --git a/net/ccnx/Portfile b/net/ccnx/Portfile
index bdc7409..7b59645 100644
--- a/net/ccnx/Portfile
+++ b/net/ccnx/Portfile
@@ -12,7 +12,7 @@
 homepage                http://www.ccnx.org/
 license                 GPL-2+ LGPL-2.1+
 version                 0.6.2
-revision                5
+revision                6
 epoch                   0
 
 categories              net ccnx
diff --git a/net/ccnx/files/autoconfig.patch b/net/ccnx/files/autoconfig.patch
index f4275c1..41ed4c7 100644
--- a/net/ccnx/files/autoconfig.patch
+++ b/net/ccnx/files/autoconfig.patch
@@ -1,5 +1,22 @@
+diff --git csrc/libexec/ccndc-srv.c csrc/libexec/ccndc-srv.c
+index f6af4ee..a2483a1 100644
+--- csrc/libexec/ccndc-srv.c
++++ csrc/libexec/ccndc-srv.c
+@@ -188,10 +188,10 @@ ccndc_query_srv(const unsigned char *domain, int domain_size,
+     
+     if (hostp) {
+         size = strlen(host);
+-        *hostp = calloc(1, size);
++        *hostp = calloc(1, size+1);
+         if (!*hostp)
+             return (-1);
+-        strncpy(*hostp, host, size);
++        strncpy(*hostp, host, size+1);
+     }
+     if (portp) {
+         *portp = port;
 diff --git csrc/libexec/ccndc.c csrc/libexec/ccndc.c
-index ecde5f0..9be6e3b 100644
+index ecde5f0..76102ed 100644
 --- csrc/libexec/ccndc.c
 +++ csrc/libexec/ccndc.c
 @@ -580,9 +580,11 @@ ccndc_srv(struct ccndc_data *self,
@@ -35,9 +52,10 @@
 +    }
      
  Cleanup:
-     free(uri);
-+    free(uri_auto);
+-    free(uri);
      free(host);
++    ccn_charbuf_destroy(&uri);
++    ccn_charbuf_destroy(&uri_auto);
      ccn_face_instance_destroy(&face);
      ccn_forwarding_entry_destroy(&prefix);
 +    ccn_forwarding_entry_destroy(&prefix_auto);