diff --git a/samples/knot.full.conf b/samples/knot.full.conf
index 2bd28c5847951429dffb8e4c167dfa36dbc8ea90..55084bdc3cc6d591b2099a6b7a7146d1149a7edb 100644
--- a/samples/knot.full.conf
+++ b/samples/knot.full.conf
@@ -20,8 +20,10 @@ system {
   # Version of the server (see RFC 4892). Not used yet.
   version "0.1";
 
-  # NSID hexstring
-  nsid 0xdeadbeef;
+  # Server identifier 
+  # Use string format "text"
+  # Or hexstring 0x01ab00
+  nsid "myserver0";
 
   # Working directory of the server
   # Used to store compiled zones and PID file
diff --git a/src/knot/conf/cf-parse.y b/src/knot/conf/cf-parse.y
index b57f6f4c255ab00617c21fe14a2d8ef5c519874c..d7eb5635afc8630fa547dfc93001834922648263 100644
--- a/src/knot/conf/cf-parse.y
+++ b/src/knot/conf/cf-parse.y
@@ -287,6 +287,7 @@ system:
  | system VERSION TEXT ';' { new_config->version = $3.t; }
  | system IDENTITY TEXT ';' { new_config->identity = $3.t; }
  | system NSID HEXSTR ';' { new_config->nsid = $3.t; new_config->nsid_len = $3.l; }
+ | system NSID TEXT ';' { new_config->nsid = $3.t; new_config->nsid_len = strlen(new_config->nsid); }
  | system STORAGE TEXT ';' { new_config->storage = $3.t; }
  | system KEY TSIG_ALGO_NAME TEXT ';' {
      fprintf(stderr, "warning: Config option 'system.key' is deprecated "
diff --git a/src/libknot/nameserver/name-server.h b/src/libknot/nameserver/name-server.h
index 45d0b8fb494a13b7779628d6ec20c746bfe4ba6a..d68084aaa2f500aa5674af51fad76f2fd6c857f0 100644
--- a/src/libknot/nameserver/name-server.h
+++ b/src/libknot/nameserver/name-server.h
@@ -177,6 +177,7 @@ typedef enum knot_ns_xfr_type_t {
  */
 knot_nameserver_t *knot_ns_create();
 
+/*! \todo Document me. */
 void knot_ns_set_nsid(knot_nameserver_t *nameserver, const char *nsid,
                       size_t nsid_length);