diff --git a/data/aut-num/AS4242423131 b/data/aut-num/AS4242423131
index 533a1c76c..0f4a2392a 100644
--- a/data/aut-num/AS4242423131
+++ b/data/aut-num/AS4242423131
@@ -1,6 +1,6 @@
 aut-num:            AS4242423131
 as-name:            RCXPONY-AS
-admin-c:            RCXP-DN42
-tech-c:             RCXP-DN42
-mnt-by:             RCXP-MNT
+admin-c:            RCXPONY-DN42
+tech-c:             RCXPONY-DN42
+mnt-by:             RCXPONY-MNT
 source:             DN42
diff --git a/data/dns/cb.dn42 b/data/dns/cb.dn42
index e0a8bf005..f9c4c073f 100644
--- a/data/dns/cb.dn42
+++ b/data/dns/cb.dn42
@@ -2,7 +2,7 @@ domain:             cb.dn42
 admin-c:            CB-DN42
 tech-c:             CB-DN42
 mnt-by:             CB-MNT
-nserver:            ns1.cb.dn42 172.20.45.129
-nserver:            ns1.cb.dn42 fdfc:4e:5f23::1
+nserver:            ns1.cb.dn42 172.20.45.142
+nserver:            ns1.cb.dn42 fdfc:4e:5f23:53::1
 ds-rdata:           31547 13 2 d3d10335d5d48aed897a9cfd4356089bed002c97394285b0d753b7325f9c3b58
 source:             DN42
diff --git a/data/dns/rcxpony.dn42 b/data/dns/rcxpony.dn42
index 0b2c7feeb..6380843b5 100644
--- a/data/dns/rcxpony.dn42
+++ b/data/dns/rcxpony.dn42
@@ -1,7 +1,7 @@
 domain:             rcxpony.dn42
-admin-c:            RCXP-DN42
-tech-c:             RCXP-DN42
-mnt-by:             RCXP-MNT
+admin-c:            RCXPONY-DN42
+tech-c:             RCXPONY-DN42
+mnt-by:             RCXPONY-MNT
 nserver:            ns1.rcxpony.dn42 172.22.255.128
 nserver:            ns1.rcxpony.dn42 fdfc:93c0:6b53::1
 source:             DN42
diff --git a/data/inet6num/fdfc:93c0:6b53::_48 b/data/inet6num/fdfc:93c0:6b53::_48
index 6e3bb7f2c..a78df12fa 100644
--- a/data/inet6num/fdfc:93c0:6b53::_48
+++ b/data/inet6num/fdfc:93c0:6b53::_48
@@ -2,9 +2,9 @@ inet6num:           fdfc:93c0:6b53:0000:0000:0000:0000:0000 - fdfc:93c0:6b53:fff
 cidr:               fdfc:93c0:6b53::/48
 netname:            RCXPONY-NETWORK
 country:            SE
-admin-c:            RCXP-DN42
-tech-c:             RCXP-DN42
-mnt-by:             RCXP-MNT
+admin-c:            RCXPONY-DN42
+tech-c:             RCXPONY-DN42
+mnt-by:             RCXPONY-MNT
 status:             ASSIGNED
 nserver:            ns1.rcxpony.dn42
 source:             DN42
diff --git a/data/inetnum/172.22.255.128_27 b/data/inetnum/172.22.255.128_27
index a0d4c611f..00ac39172 100644
--- a/data/inetnum/172.22.255.128_27
+++ b/data/inetnum/172.22.255.128_27
@@ -2,9 +2,9 @@ inetnum:            172.22.255.128 - 172.22.255.159
 cidr:               172.22.255.128/27
 netname:            RCXPONY-NETWORK
 country:            SE
-admin-c:            RCXP-DN42
-tech-c:             RCXP-DN42
-mnt-by:             RCXP-MNT
+admin-c:            RCXPONY-DN42
+tech-c:             RCXPONY-DN42
+mnt-by:             RCXPONY-MNT
 status:             ASSIGNED
 nserver:            ns1.rcxpony.dn42
 source:             DN42
diff --git a/data/mntner/RCXPONY-MNT b/data/mntner/RCXPONY-MNT
new file mode 100644
index 000000000..31b07a3ac
--- /dev/null
+++ b/data/mntner/RCXPONY-MNT
@@ -0,0 +1,6 @@
+mntner :            RCXPONY-MNT
+admin-c:            RCXPONY-DN42
+tech-c:             RCXPONY-DN42
+mnt-by:             RCXPONY-MNT
+auth:               pgp-fingerprint F48658FA965A6A0132CD64185C45C531B25ECF45
+source:             DN42
diff --git a/data/person/RCXPONY-DN42 b/data/person/RCXPONY-DN42
new file mode 100644
index 000000000..e79a72215
--- /dev/null
+++ b/data/person/RCXPONY-DN42
@@ -0,0 +1,5 @@
+person:             rcxpony
+e-mail:             rcxpony@rcxpony.name
+nic-hdl:            RCXPONY-DN42
+mnt-by:             RCXPONY-MNT
+source:             DN42
diff --git a/data/route/172.22.255.128_27 b/data/route/172.22.255.128_27
index c7cee1cf5..6b8d2ee35 100644
--- a/data/route/172.22.255.128_27
+++ b/data/route/172.22.255.128_27
@@ -1,5 +1,5 @@
 route:              172.22.255.128/27
 origin:             AS4242423131
 max-length:         27
-mnt-by:             RCXP-MNT
+mnt-by:             RCXPONY-MNT
 source:             DN42
diff --git a/data/route6/fdfc:93c0:6b53::_48 b/data/route6/fdfc:93c0:6b53::_48
index a563906fa..f3a961d64 100644
--- a/data/route6/fdfc:93c0:6b53::_48
+++ b/data/route6/fdfc:93c0:6b53::_48
@@ -1,5 +1,5 @@
 route6:             fdfc:93c0:6b53::/48
 origin:             AS4242423131
 max-length:         48
-mnt-by:             RCXP-MNT
+mnt-by:             RCXPONY-MNT
 source:             DN42