diff --git a/data/aut-num/AS4242423432 b/data/aut-num/AS4242423432
index 4c9c9a47a..286183c7f 100644
--- a/data/aut-num/AS4242423432
+++ b/data/aut-num/AS4242423432
@@ -1,6 +1,6 @@
 aut-num:            AS4242423432
 as-name:            S6V-AS
-admin-c:            PPMATHIS-DN42
-tech-c:             PPMATHIS-DN42
+admin-c:            S6V-DN42
+tech-c:             S6V-DN42
 mnt-by:             S6V-MNT
 source:             DN42
diff --git a/data/dns/s6v.dn42 b/data/dns/s6v.dn42
new file mode 100644
index 000000000..940cf5794
--- /dev/null
+++ b/data/dns/s6v.dn42
@@ -0,0 +1,12 @@
+domain:             s6v.dn42
+admin-c:            S6V-DN42
+tech-c:             S6V-DN42
+mnt-by:             S6V-MNT
+nserver:            ns1.s6v.dn42 172.23.49.65
+nserver:            ns1.s6v.dn42 fd0c:4c40:5760::1
+nserver:            ns2.s6v.dn42 172.23.49.66
+nserver:            ns2.s6v.dn42 fd0c:4c40:5760::2
+nserver:            ns3.s6v.dn42 172.23.49.67
+nserver:            ns3.s6v.dn42 fd0c:4c40:5760::3
+ds-rdata:           53805 13 2 EA7B95D962ABF24458DBCA7CBD60DCDBE0450ACFCADCEDBBB9DC9FAA2549CB13
+source:             DN42
diff --git a/data/inet6num/fd0c:4c40:5760::_48 b/data/inet6num/fd0c:4c40:5760::_48
index 832cae094..f4596abc0 100644
--- a/data/inet6num/fd0c:4c40:5760::_48
+++ b/data/inet6num/fd0c:4c40:5760::_48
@@ -2,8 +2,12 @@ inet6num:           fd0c:4c40:5760:0000:0000:0000:0000:0000 - fd0c:4c40:5760:fff
 cidr:               fd0c:4c40:5760::/48
 netname:            S6V
 descr:              s6v.dn42
-admin-c:            PPMATHIS-DN42
-tech-c:             PPMATHIS-DN42
+admin-c:            S6V-DN42
+tech-c:             S6V-DN42
 mnt-by:             S6V-MNT
+nserver:            ns1.s6v.dn42
+nserver:            ns2.s6v.dn42
+nserver:            ns3.s6v.dn42
+ds-rdata:           47233 13 2 A4222E1A2B44EB7F839DA0AAFC3B6D6044BA96624C27E897E30C18E503B3876A
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.23.49.64_27 b/data/inetnum/172.23.49.64_27
index 4c2ec0fbc..44f361cd3 100644
--- a/data/inetnum/172.23.49.64_27
+++ b/data/inetnum/172.23.49.64_27
@@ -2,8 +2,12 @@ inetnum:            172.23.49.64 - 172.23.49.95
 cidr:               172.23.49.64/27
 netname:            S6V
 descr:              s6v.dn42
-admin-c:            PPMATHIS-DN42
-tech-c:             PPMATHIS-DN42
+admin-c:            S6V-DN42
+tech-c:             S6V-DN42
 mnt-by:             S6V-MNT
+nserver:            ns1.s6v.dn42
+nserver:            ns2.s6v.dn42
+nserver:            ns3.s6v.dn42
+ds-rdata:           55254 13 2 D9A6834BC963A4737E72C2A57F4A24065260CCFC89E0304CDBCD4209B47F5794
 status:             ASSIGNED
 source:             DN42
diff --git a/data/mntner/S6V-MNT b/data/mntner/S6V-MNT
index cb96918c3..243f04517 100644
--- a/data/mntner/S6V-MNT
+++ b/data/mntner/S6V-MNT
@@ -1,6 +1,6 @@
 mntner:             S6V-MNT
-admin-c:            PPMATHIS-DN42
-tech-c:             PPMATHIS-DN42
+admin-c:            S6V-DN42
+tech-c:             S6V-DN42
 mnt-by:             S6V-MNT
 auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJBs2lSgwcl9pjg+aEFbCVzjsKtFk4KqQzMhSGXcVmws
 source:             DN42
diff --git a/data/person/PPMATHIS-DN42 b/data/person/PPMATHIS-DN42
deleted file mode 100644
index f22209f4b..000000000
--- a/data/person/PPMATHIS-DN42
+++ /dev/null
@@ -1,6 +0,0 @@
-person:             Pascal Mathis
-e-mail:             contact@ppmathis.com
-www:                https://ppmathis.com
-nic-hdl:            PPMATHIS-DN42
-mnt-by:             S6V-MNT
-source:             DN42
diff --git a/data/person/S6V-DN42 b/data/person/S6V-DN42
new file mode 100644
index 000000000..d4932e75f
--- /dev/null
+++ b/data/person/S6V-DN42
@@ -0,0 +1,6 @@
+person:             Pascal Mathis
+e-mail:             dn42@ppmathis.com
+www:                https://dn42.s6v.net
+nic-hdl:            S6V-DN42
+mnt-by:             S6V-MNT
+source:             DN42