diff --git a/CMakeLists.txt b/CMakeLists.txt
index f962223..4df6883 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,19 +238,16 @@ int main(int argc, char* argv[])
 	for (int rrnum = 0, n = ns_msg_count(handle, ns_s_an); rrnum < n; ++rrnum) {
 		ns_rr rr;
 		if ((ns_parserr(&handle, ns_s_an, rrnum, &rr) == 0) && (ns_rr_type(rr) == ns_t_txt)) {
-			const uint8_t* data = ns_rr_rdata(rr);
-
-			int len = ns_rr_rdlen(rr) - 1;
-			if (len > data[0]) len = data[0];
-
-			if (len <= 0) {
-				continue;
+			for (const uint8_t* data = ns_rr_rdata(rr), *e = data + ns_rr_rdlen(rr); data < e;) {
+				const int k = *(data++);
+				if (k && (data + k <= e)) {
+					char buf[256];
+					memcpy(buf, data, k);
+					buf[k] = 0;
+					puts(buf);
+				}
+				data += k;
 			}
-
-			char buf[256];
-			memcpy(buf, data + 1, len);
-			buf[len] = 0;
-			puts(buf);
 		}
 	}
 
diff --git a/src/util.cpp b/src/util.cpp
index 4306371..18a286e 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -517,10 +517,12 @@ bool get_dns_txt_records_base(const std::string& host, Callback<void, const char
 	for (int rrnum = 0, n = ns_msg_count(handle, ns_s_an); rrnum < n; ++rrnum) {
 		ns_rr rr;
 		if ((ns_parserr(&handle, ns_s_an, rrnum, &rr) == 0) && (ns_rr_type(rr) == ns_t_txt)) {
-			const uint8_t* s = ns_rr_rdata(rr);
-			const int n = std::min<int>(ns_rr_rdlen(rr) - 1, *s);
-			if (n > 0) {
-				callback(reinterpret_cast<const char*>(s + 1), static_cast<size_t>(n));
+			for (const uint8_t* data = ns_rr_rdata(rr), *e = data + ns_rr_rdlen(rr); data < e;) {
+				const size_t k = *(data++);
+				if (k && (data + k <= e)) {
+					callback(reinterpret_cast<const char*>(data), k);
+				}
+				data += k;
 			}
 		}
 	}