Index: uspace/srv/net/dnsrsrv/dns_msg.c
===================================================================
--- uspace/srv/net/dnsrsrv/dns_msg.c	(revision a0d97f83cd44a9bf7925069dc2adc60e73288376)
+++ uspace/srv/net/dnsrsrv/dns_msg.c	(revision ef90489533a7bc7e91d2f7f7f7592ccfbe533ed6)
@@ -37,4 +37,5 @@
 #include <byteorder.h>
 #include <errno.h>
+#include <io/log.h>
 #include <macros.h>
 #include <stdint.h>
@@ -76,5 +77,4 @@
 }
 
-#include <stdio.h>
 static int dns_name_encode(char *name, uint8_t *buf, size_t buf_size,
     size_t *act_size)
@@ -89,14 +89,10 @@
 	off = 0;
 
-	printf("dns_name_encode(name='%s', buf=%p, buf_size=%zu, act_size=%p\n",
-	    name, buf, buf_size, act_size);
 	lsize = 0;
 	while (true) {
-		printf("off=%zu\n", off);
 		c = str_decode(name, &off, STR_NO_LIMIT);
-		printf("c=%d\n", (int)c);
 		if (c >= 127) {
 			/* Non-ASCII character */
-			printf("non-ascii character\n");
+			log_msg(LOG_DEFAULT, LVL_DEBUG, "Non-ascii character");
 			return EINVAL;
 		}
@@ -105,5 +101,5 @@
 			/* Empty string, starting with period or two consecutive periods. */
 			if (lsize == 0) {
-				printf("empty token\n");
+				log_msg(LOG_DEFAULT, LVL_DEBUG, "Empty token");
 				return EINVAL;
 			}
@@ -111,5 +107,5 @@
 			if (lsize > DNS_LABEL_MAX_SIZE) {
 				/* Label too long */
-				printf("label too long\n");
+				log_msg(LOG_DEFAULT, LVL_DEBUG, "Label too long");
 				return EINVAL;
 			}
@@ -177,5 +173,4 @@
 
 		if (!first) {
-			printf(".");
 			rc = dns_dstr_ext(&name, ".");
 			if (rc != EOK) {
@@ -186,8 +181,7 @@
 
 		if ((lsize & 0xc0) == 0xc0) {
-			printf("Pointer\n");
 			/* Pointer */
 			if (bsize < 1) {
-				printf("Pointer- bsize < 1\n");
+				log_msg(LOG_DEFAULT, LVL_DEBUG, "Pointer- bsize < 1");
 				rc = EINVAL;
 				goto error;
@@ -199,5 +193,6 @@
 
 			if (ptr >= (size_t)(bp - buf)) {
-				printf("Pointer- forward ref %u, pos=%u\n",
+				log_msg(LOG_DEFAULT, LVL_DEBUG,
+				    "Pointer- forward ref %u, pos=%u",
 				    ptr, bp - buf);
 				/* Forward reference */
@@ -217,5 +212,4 @@
 			*eoff = eptr;
 
-			printf("ptr=%u, eptr=%u\n", ptr, eptr);
 			bp = buf + ptr;
 			bsize = eptr - ptr;
@@ -229,6 +223,4 @@
 
 		for (i = 0; i < lsize; i++) {
-			printf("%c", *bp);
-
 			if (*bp < 32 || *bp >= 127) {
 				rc = EINVAL;
@@ -251,6 +243,4 @@
 	}
 
-	printf("\n");
-
 	*rname = name;
 	if (*eoff == 0)
@@ -291,6 +281,4 @@
 	    buf[3];
 
-	printf("dns_uint32_t_decode: %x, %x, %x, %x -> %x\n",
-	    buf[0], buf[1], buf[2], buf[3], w);
 	return w;
 }
@@ -307,8 +295,5 @@
 		return rc;
 
-	printf("name_size=%zu\n", name_size);
-
 	*act_size = name_size + sizeof(uint16_t) + sizeof(uint16_t);
-	printf("act_size=%zu\n", *act_size);
 	if (buf == NULL)
 		return EOK;
@@ -336,16 +321,12 @@
 		return ENOMEM;
 
-	printf("decode name..\n");
 	rc = dns_name_decode(buf, buf_size, boff, &question->qname, &name_eoff);
 	if (rc != EOK) {
-		printf("error decoding name..\n");
+		log_msg(LOG_DEFAULT, LVL_DEBUG, "Error decoding name");
 		free(question);
 		return ENOMEM;
 	}
 
-	printf("ok decoding name..\n");
 	if (name_eoff + 2 * sizeof(uint16_t) > buf_size) {
-		printf("name_eoff + 2 * 2 = %d >  buf_size = %d\n",
-		    name_eoff + 2 * sizeof(uint16_t), buf_size);
 		free(question);
 		return EINVAL;
@@ -375,16 +356,12 @@
 		return ENOMEM;
 
-	printf("decode name..\n");
 	rc = dns_name_decode(buf, buf_size, boff, &rr->name, &name_eoff);
 	if (rc != EOK) {
-		printf("error decoding name..\n");
+		log_msg(LOG_DEFAULT, LVL_DEBUG, "Error decoding name");
 		free(rr);
 		return ENOMEM;
 	}
 
-	printf("ok decoding name.. '%s'\n", rr->name);
 	if (name_eoff + 2 * sizeof(uint16_t) > buf_size) {
-		printf("name_eoff + 2 * 2 = %d >  buf_size = %d\n",
-		    name_eoff + 2 * sizeof(uint16_t), buf_size);
 		free(rr->name);
 		free(rr);
@@ -403,17 +380,13 @@
 	rr->rtype = dns_uint16_t_decode(bp, bsz);
 	bp += sizeof(uint16_t); bsz -= sizeof(uint16_t);
-	printf("rtype=%u\n", rr->rtype);
 
 	rr->rclass = dns_uint16_t_decode(bp, bsz);
 	bp += sizeof(uint16_t); bsz -= sizeof(uint16_t);
-	printf("rclass=%u\n", rr->rclass);
 
 	rr->ttl = dns_uint32_t_decode(bp, bsz);
 	bp += sizeof(uint32_t); bsz -= sizeof(uint32_t);
-	printf("ttl=%u\n", rr->ttl);
 
 	rdlength = dns_uint16_t_decode(bp, bsz);
 	bp += sizeof(uint16_t); bsz -= sizeof(uint16_t);
-	printf("rdlength=%u\n", rdlength);
 
 	if (rdlength > bsz) {
@@ -467,5 +440,4 @@
 
 	size = sizeof(dns_header_t);
-	printf("dns header size=%zu\n", size);
 
 	list_foreach(msg->question, link) {
@@ -475,5 +447,4 @@
 			return rc;
 
-		printf("q_size=%zu\n", q_size);
 		size += q_size;
 	}
@@ -498,5 +469,4 @@
 	}
 
-	printf("-> size=%zu, di=%zu\n", size, di);
 	*rdata = data;
 	*rsize = size;
@@ -540,14 +510,11 @@
 
 	qd_count = uint16_t_be2host(hdr->qd_count);
-	printf("qd_count = %d\n", (int)qd_count);
 
 	for (i = 0; i < qd_count; i++) {
-		printf("decode question..\n");
 		rc = dns_question_decode(data, size, doff, &question, &field_eoff);
 		if (rc != EOK) {
-			printf("error decoding question\n");
+			log_msg(LOG_DEFAULT, LVL_DEBUG, "error decoding question");
 			goto error;
 		}
-		printf("ok decoding question\n");
 
 		list_append(&question->msg, &msg->question);
@@ -556,21 +523,15 @@
 
 	an_count = uint16_t_be2host(hdr->an_count);
-	printf("an_count = %d\n", an_count);
 
 	for (i = 0; i < an_count; i++) {
-		printf("decode answer..\n");
 		rc = dns_rr_decode(data, size, doff, &rr, &field_eoff);
 		if (rc != EOK) {
-			printf("error decoding answer\n");
+			log_msg(LOG_DEFAULT, LVL_DEBUG, "Error decoding answer");
 			goto error;
 		}
-		printf("ok decoding answer\n");
 
 		list_append(&rr->msg, &msg->answer);
 		doff = field_eoff;
 	}
-
-	printf("ns_count = %d\n", uint16_t_be2host(hdr->ns_count));
-	printf("ar_count = %d\n", uint16_t_be2host(hdr->ar_count));
 
 	*rmsg = msg;
Index: uspace/srv/net/dnsrsrv/query.c
===================================================================
--- uspace/srv/net/dnsrsrv/query.c	(revision a0d97f83cd44a9bf7925069dc2adc60e73288376)
+++ uspace/srv/net/dnsrsrv/query.c	(revision ef90489533a7bc7e91d2f7f7f7592ccfbe533ed6)
@@ -86,5 +86,5 @@
 		dns_rr_t *rr = list_get_instance(link, dns_rr_t, msg);
 
-		log_msg(LOG_DEFAULT, LVL_DEBUG, " - '%s' %u/%u, dsize %u\n",
+		log_msg(LOG_DEFAULT, LVL_DEBUG, " - '%s' %u/%u, dsize %u",
 			rr->name, rr->rtype, rr->rclass, rr->rdata_size);
 
@@ -100,5 +100,5 @@
 			info->name = str_dup(rr->name);
 			info->addr.ipv4 = dns_uint32_t_decode(rr->rdata, rr->rdata_size);
-			log_msg(LOG_DEFAULT, LVL_DEBUG, "info->addr = %x\n",
+			log_msg(LOG_DEFAULT, LVL_DEBUG, "info->addr = %x",
 			    info->addr.ipv4);
 
@@ -112,5 +112,5 @@
 	dns_message_destroy(msg);
 	dns_message_destroy(amsg);
-	log_msg(LOG_DEFAULT, LVL_DEBUG, "No A/IN found, fail\n");
+	log_msg(LOG_DEFAULT, LVL_DEBUG, "No A/IN found, fail");
 
 	return EIO;
Index: uspace/srv/net/dnsrsrv/transport.c
===================================================================
--- uspace/srv/net/dnsrsrv/transport.c	(revision a0d97f83cd44a9bf7925069dc2adc60e73288376)
+++ uspace/srv/net/dnsrsrv/transport.c	(revision ef90489533a7bc7e91d2f7f7f7592ccfbe533ed6)
@@ -108,5 +108,5 @@
 	return EOK;
 error:
-	log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing network socket.\n");
+	log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing network socket.");
 	if (fd >= 0)
 		closesocket(fd);
@@ -246,5 +246,5 @@
 	    (struct sockaddr *)&src_addr, &src_addr_size);
 	if (rc < 0) {
-		log_msg(LOG_DEFAULT, LVL_ERROR, "recvfrom returns error - %d\n", rc);
+		log_msg(LOG_DEFAULT, LVL_ERROR, "recvfrom returns error - %d", rc);
 		goto error;
 	}