diff --git a/data/aut-num/AS4242420092 b/data/aut-num/AS4242420092
deleted file mode 100644
index 45b4a167f..000000000
--- a/data/aut-num/AS4242420092
+++ /dev/null
@@ -1,8 +0,0 @@
-aut-num:            AS4242420092
-as-name:            EVE-AS
-descr:              evenet
-remarks:            peering via openvpn, ipsec/gre (only via ipv6), tinc, fastd or wireguard
-admin-c:            MIC92-DN42
-tech-c:             MIC92-DN42
-mnt-by:             MIC92-MNT
-source:             DN42
diff --git a/data/aut-num/AS4242420141 b/data/aut-num/AS4242420141
index 1a6472efe..51a351dc4 100644
--- a/data/aut-num/AS4242420141
+++ b/data/aut-num/AS4242420141
@@ -1,6 +1,6 @@
 aut-num:            AS4242420141
 as-name:            NETRAVNEN-NETWORK-DEFAULT-INSTANCE
-admin-c:            NETRAVNEN-DN42
-tech-c:             NETRAVNEN-DN42
+admin-c:            ORG-NETRAVNEN-DN42
+tech-c:             ORG-NETRAVNEN-DN42
 mnt-by:             NETRAVNEN-MNT
 source:             DN42
diff --git a/data/aut-num/AS4242420144 b/data/aut-num/AS4242420144
index 16448f6ff..11fa2d784 100644
--- a/data/aut-num/AS4242420144
+++ b/data/aut-num/AS4242420144
@@ -1,6 +1,6 @@
 aut-num:            AS4242420144
 as-name:            NETRAVNEN-NETWORK-VIRTUAL-LAB
-admin-c:            NETRAVNEN-DN42
-tech-c:             NETRAVNEN-DN42
+admin-c:            ORG-NETRAVNEN-DN42
+tech-c:             ORG-NETRAVNEN-DN42
 mnt-by:             NETRAVNEN-MNT
 source:             DN42
diff --git a/data/aut-num/AS4242420151 b/data/aut-num/AS4242420151
new file mode 100644
index 000000000..5c76880cc
--- /dev/null
+++ b/data/aut-num/AS4242420151
@@ -0,0 +1,7 @@
+aut-num:            AS4242420151
+as-name:            BNET-AS
+descr:              bauen1 testnetwork
+admin-c:            BAUEN1-DN42
+tech-c:             BAUEN1-DN42
+mnt-by:             BAUEN1-MNT
+source:             DN42
diff --git a/data/aut-num/AS4242420210 b/data/aut-num/AS4242420210
new file mode 100644
index 000000000..bd2eaaa4c
--- /dev/null
+++ b/data/aut-num/AS4242420210
@@ -0,0 +1,6 @@
+aut-num:            AS4242420210
+as-name:            WHMCR
+admin-c:            WHMCR-DN42
+tech-c:             WHMCR-DN42
+mnt-by:             WHMCR-MNT
+source:             DN42
diff --git a/data/aut-num/AS4242420616 b/data/aut-num/AS4242420616
new file mode 100644
index 000000000..b9d0ac89e
--- /dev/null
+++ b/data/aut-num/AS4242420616
@@ -0,0 +1,6 @@
+aut-num:            AS4242420616
+as-name:            AS for Aotokitsuruya Network
+admin-c:            AOTOKI-DN42
+tech-c:             AOTOKI-DN42
+mnt-by:             AOTOKI-MNT
+source:             DN42
diff --git a/data/aut-num/AS4242421178 b/data/aut-num/AS4242421178
new file mode 100644
index 000000000..438ef6a36
--- /dev/null
+++ b/data/aut-num/AS4242421178
@@ -0,0 +1,6 @@
+aut-num:            AS4242421178
+as-name:            DOZENCLOUD AS
+admin-c:            DOZENCLOUD-DN42
+tech-c:             DOZENCLOUD-DN42
+mnt-by:             DOZENCLOUD-MNT
+source:             DN42
diff --git a/data/aut-num/AS4242421873 b/data/aut-num/AS4242421873
new file mode 100644
index 000000000..fd65cdc72
--- /dev/null
+++ b/data/aut-num/AS4242421873
@@ -0,0 +1,7 @@
+aut-num:            AS4242421873
+as-name:            RMNTN-NET-AS
+org:                ORG-RMNTN
+admin-c:            RACOMAIZER-DN42
+tech-c:             RACOMAIZER-DN42
+mnt-by:             RMNTN-MNT
+source:             DN42
diff --git a/data/aut-num/AS4242422439 b/data/aut-num/AS4242422439
index 16079136a..1a400ff43 100644
--- a/data/aut-num/AS4242422439
+++ b/data/aut-num/AS4242422439
@@ -2,5 +2,5 @@ aut-num:            AS4242422439
 as-name:            AS for DannyAAM
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 source:             DN42
diff --git a/data/aut-num/AS64698 b/data/aut-num/AS64698
index 9cf261c29..208bb4c75 100644
--- a/data/aut-num/AS64698
+++ b/data/aut-num/AS64698
@@ -2,7 +2,10 @@ aut-num:            AS64698
 as-name:            C3D2WETU-AS
 descr:              CCC Dresden Server
 org:                ORG-C3D2
-admin-c:            MIC92-DN42
-tech-c:             MIC92-DN42
-mnt-by:             MIC92-MNT
+admin-c:            ASTRO-DN42
+admin-c:            ERI-DN42
+tech-c:             ASTRO-DN42
+tech-c:             ERI-DN42
+mnt-by:             ASTRO-MNT
+mnt-by:             ERI-MNT
 source:             DN42
diff --git a/data/dns/aotoki.dn42 b/data/dns/aotoki.dn42
new file mode 100644
index 000000000..e3e3574ad
--- /dev/null
+++ b/data/dns/aotoki.dn42
@@ -0,0 +1,8 @@
+domain:             aotoki.dn42
+admin-c:            AOTOKI-DN42
+tech-c:             AOTOKI-DN42
+mnt-by:             AOTOKI-MNT
+nserver:            ns.aotoki.dn42 172.20.160.64
+nserver:            ns.aotoki.dn42 fd42:0568:127c::1
+status:             CONNECT
+source:             DN42
diff --git a/data/dns/as1873.dn42 b/data/dns/as1873.dn42
new file mode 100644
index 000000000..8414952a6
--- /dev/null
+++ b/data/dns/as1873.dn42
@@ -0,0 +1,10 @@
+domain:             as1873.dn42
+descr:              Remonton Network AS domain
+org:                ORG-RMNTN
+admin-c:            RACOMAIZER-DN42
+tech-c:             RACOMAIZER-DN42
+mnt-by:             RMNTN-MNT
+nserver:            ns.as1873.dn42 172.22.181.2
+nserver:            ns.as1873.dn42 fdfd:d0b7:5feb:c07e:0778:0000:0000:0002
+status:             EVALPEND 1537036569
+source:             DN42
diff --git a/data/dns/bnet.dn42 b/data/dns/bnet.dn42
new file mode 100644
index 000000000..0e46e4adb
--- /dev/null
+++ b/data/dns/bnet.dn42
@@ -0,0 +1,8 @@
+domain:             bnet.dn42
+admin-c:            BAUEN1-DN42
+tech-c:             BAUEN1-DN42
+mnt-by:             BAUEN1-MNT
+nserver:            ns1.bnet.dn42 172.20.18.224
+nserver:            ns1.bnet.dn42 fdbb:baba:2468::1
+status:             CONNECT
+source:             DN42
diff --git a/data/dns/dozencloud.dn42 b/data/dns/dozencloud.dn42
new file mode 100644
index 000000000..20be27c2f
--- /dev/null
+++ b/data/dns/dozencloud.dn42
@@ -0,0 +1,8 @@
+domain:             dozencloud.dn42
+nserver:            ns1.dozencloud.dn42 172.23.173.1
+nserver:            ns1.dozencloud.dn42 fd42:68c2:8747::1
+admin-c:            DOZENCLOUD-DN42
+tech-c:             DOZENCLOUD-DN42
+status:             CONNECT
+mnt-by:             DOZENCLOUD-MNT
+source:             DN42
diff --git a/data/dns/evenet.dn42 b/data/dns/evenet.dn42
deleted file mode 100644
index 6c03c5893..000000000
--- a/data/dns/evenet.dn42
+++ /dev/null
@@ -1,9 +0,0 @@
-domain:             evenet.dn42
-descr:              evenet domain
-admin-c:            MIC92-DN42
-tech-c:             MIC92-DN42
-mnt-by:             MIC92-MNT
-nserver:            ns1.evenet.dn42 172.23.75.6
-nserver:            ns1.evenet.dn42 fd42:4992:6a6d::6
-status:             EVALPEND 1503916413
-source:             DN42
diff --git a/data/dns/saru.dn42 b/data/dns/saru.dn42
index df022ce26..80b68c264 100644
--- a/data/dns/saru.dn42
+++ b/data/dns/saru.dn42
@@ -2,7 +2,7 @@ domain:             saru.dn42
 descr:              DannyAAM's DN42 domain
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 nserver:            lb.ns.saru.dn42 172.20.239.193
 nserver:            lb.ns.saru.dn42 fd39:1c:2c1b:3939::3901
 nserver:            saru.ns.saru.dn42 172.20.239.198
diff --git a/data/dns/webtorrent.dn42 b/data/dns/webtorrent.dn42
deleted file mode 100644
index 465ef3cda..000000000
--- a/data/dns/webtorrent.dn42
+++ /dev/null
@@ -1,9 +0,0 @@
-domain:             webtorrent.dn42
-descr:              Deluge webtorrent 500GB Disk / 100 GB daily traffic limit
-admin-c:            MIC92-DN42
-tech-c:             MIC92-DN42
-mnt-by:             MIC92-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
-status:             EVALPEND 1503745132
-source:             DN42
diff --git a/data/dns/whmcr.dn42 b/data/dns/whmcr.dn42
new file mode 100644
index 000000000..4b8889814
--- /dev/null
+++ b/data/dns/whmcr.dn42
@@ -0,0 +1,8 @@
+domain:             whmcr.dn42
+admin-c:            WHMCR-DN42
+tech-c:             WHMCR-DN42
+mnt-by:             WHMCR-MNT
+nserver:            ns1.whmcr.dn42 fd42:f7b1:1078::2
+nserver:            ns1.whmcr.dn42 172.20.47.130
+status:             CONNECT
+source:             DN42
diff --git a/data/inet6num/fd00:aaaa:251::_48 b/data/inet6num/fd00:aaaa:251::_48
index 38f549ef1..6462d9c38 100644
--- a/data/inet6num/fd00:aaaa:251::_48
+++ b/data/inet6num/fd00:aaaa:251::_48
@@ -2,8 +2,8 @@ inet6num:           fd00:aaaa:0251:0000:0000:0000:0000:0000 - fd00:aaaa:0251:fff
 netname:            NETRAVNEN-NETWORK-VIRTUAL-LAB
 descr:              NETRAVNEN
 country:            DK
-admin-c:            NETRAVNEN-DN42
-tech-c:             NETRAVNEN-DN42
+admin-c:            ORG-NETRAVNEN-DN42
+tech-c:             ORG-NETRAVNEN-DN42
 mnt-by:             NETRAVNEN-MNT
 status:             ASSIGNED
 cidr:               fd00:aaaa:251::/48
diff --git a/data/inet6num/fd00:aaaa:255::_48 b/data/inet6num/fd00:aaaa:255::_48
index 67f814e48..c741abf3b 100644
--- a/data/inet6num/fd00:aaaa:255::_48
+++ b/data/inet6num/fd00:aaaa:255::_48
@@ -2,8 +2,8 @@ inet6num:           fd00:aaaa:0255:0000:0000:0000:0000:0000 - fd00:aaaa:0255:fff
 netname:            NETRAVNEN-NET
 descr:              NETRAVNEN
 country:            DK
-admin-c:            NETRAVNEN-DN42
-tech-c:             NETRAVNEN-DN42
+admin-c:            ORG-NETRAVNEN-DN42
+tech-c:             ORG-NETRAVNEN-DN42
 mnt-by:             NETRAVNEN-MNT
 status:             ASSIGNED
 cidr:               fd00:aaaa:255::/48
diff --git a/data/inet6num/fd17:149a:85f9::_48 b/data/inet6num/fd17:149a:85f9::_48
index c0a566a06..2168fd9ae 100644
--- a/data/inet6num/fd17:149a:85f9::_48
+++ b/data/inet6num/fd17:149a:85f9::_48
@@ -6,7 +6,5 @@ country:            IN
 admin-c:            KM17-DN42
 tech-c:             KM17-DN42
 mnt-by:             TECHNOPOINT-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inet6num/fd19:db3f:e896:1::_64 b/data/inet6num/fd19:db3f:e896:1::_64
index b7711846d..4f543d3b3 100644
--- a/data/inet6num/fd19:db3f:e896:1::_64
+++ b/data/inet6num/fd19:db3f:e896:1::_64
@@ -5,7 +5,6 @@ country:            DE
 admin-c:            JAJO-DN42
 tech-c:             JAJO-DN42
 mnt-by:             JAJO-MNT
-nserver:            ns1.evenet.dn42
 status:             ASSIGNED
 cidr:               fd19:db3f:e896:1::/64
 source:             DN42
diff --git a/data/inet6num/fd19:db3f:e896:2::_64 b/data/inet6num/fd19:db3f:e896:2::_64
index 051c2a8d9..cfa85f493 100644
--- a/data/inet6num/fd19:db3f:e896:2::_64
+++ b/data/inet6num/fd19:db3f:e896:2::_64
@@ -5,7 +5,6 @@ country:            DE
 admin-c:            JAJO-DN42
 tech-c:             JAJO-DN42
 mnt-by:             JAJO-MNT
-nserver:            ns1.evenet.dn42
 status:             ASSIGNED
 cidr:               fd19:db3f:e896:2::/64
 source:             DN42
diff --git a/data/inet6num/fd19:db3f:e896::_64 b/data/inet6num/fd19:db3f:e896::_64
index 4267b0b08..84c919d05 100644
--- a/data/inet6num/fd19:db3f:e896::_64
+++ b/data/inet6num/fd19:db3f:e896::_64
@@ -5,7 +5,6 @@ country:            DE
 admin-c:            JAJO-DN42
 tech-c:             JAJO-DN42
 mnt-by:             JAJO-MNT
-nserver:            ns1.evenet.dn42
 status:             ASSIGNED
 cidr:               fd19:db3f:e896::/64
 source:             DN42
diff --git a/data/inet6num/fd23:42:c3d2::_56 b/data/inet6num/fd23:42:c3d2::_56
index ed9770b1d..0e538970a 100644
--- a/data/inet6num/fd23:42:c3d2::_56
+++ b/data/inet6num/fd23:42:c3d2::_56
@@ -2,10 +2,13 @@ inet6num:           fd23:0042:c3d2:0000:0000:0000:0000:0000 - fd23:0042:c3d2:00f
 netname:            C3D2-WETU
 country:            DE
 org:                ORG-C3D2
-admin-c:            MIC92-DN42
-tech-c:             MIC92-DN42
-mnt-by:             MIC92-MNT
+admin-c:            ASTRO-DN42
+admin-c:            ERI-DN42
+tech-c:             ASTRO-DN42
+tech-c:             ERI-DN42
+mnt-by:             ASTRO-MNT
+mnt-by:             ERI-MNT
 nserver:            ns.c3d2.de
-status:             ALLOCATED
+status:             ASSIGNED
 cidr:               fd23:42:c3d2::/56
 source:             DN42
diff --git a/data/inet6num/fd39:1c:2c1b::_48 b/data/inet6num/fd39:1c:2c1b::_48
index 2272a9227..97d79065e 100644
--- a/data/inet6num/fd39:1c:2c1b::_48
+++ b/data/inet6num/fd39:1c:2c1b::_48
@@ -3,7 +3,7 @@ cidr:               fd39:1c:2c1b::/48
 netname:            SARU-MOE
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 nserver:            lb.ns.saru.dn42
 nserver:            saru.ns.saru.dn42
 nserver:            hebi.ns.saru.dn42
diff --git a/data/inet6num/fd41:3dc2:f135::_48 b/data/inet6num/fd41:3dc2:f135::_48
index d6e4d5176..9b8343e22 100644
--- a/data/inet6num/fd41:3dc2:f135::_48
+++ b/data/inet6num/fd41:3dc2:f135::_48
@@ -4,8 +4,6 @@ country:            CN
 admin-c:            RENDA-DN42
 tech-c:             RENDA-DN42
 mnt-by:             RN-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 cidr:               fd41:3dc2:f135::/48
 source:             DN42
diff --git a/data/inet6num/fd42:0568:127c::_48 b/data/inet6num/fd42:0568:127c::_48
new file mode 100644
index 000000000..4a4e77128
--- /dev/null
+++ b/data/inet6num/fd42:0568:127c::_48
@@ -0,0 +1,12 @@
+inet6num:           fd42:0568:127c:0000:0000:0000:0000:0000 - fd42:0568:127c:ffff:ffff:ffff:ffff:ffff
+cidr:               fd42:0568:127c::/48
+netname:            AOTOKI-NETWORK
+descr:              Network of Aotoki
+country:            TW
+admin-c:            AOTOKI-DN42
+tech-c:             AOTOKI-DN42
+mnt-by:             AOTOKI-MNT
+nserver:            ns1.aotoki.dn42
+nserver:            ns2.aotoki.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inet6num/fd42:3667:3667::_48 b/data/inet6num/fd42:3667:3667::_48
index 8e94bc3d7..1ec1e4747 100644
--- a/data/inet6num/fd42:3667:3667::_48
+++ b/data/inet6num/fd42:3667:3667::_48
@@ -6,7 +6,5 @@ admin-c:            XICONFJS-DN42
 tech-c:             XICONFJS-DN42
 mnt-by:             XICON-MNT
 status:             ASSIGNED
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 cidr:               fd42:3667:3667::/48
 source:             DN42
diff --git a/data/inet6num/fd42:4992:6a6d::_48 b/data/inet6num/fd42:4992:6a6d::_48
deleted file mode 100644
index 0acc7996d..000000000
--- a/data/inet6num/fd42:4992:6a6d::_48
+++ /dev/null
@@ -1,12 +0,0 @@
-inet6num:           fd42:4992:6a6d:0000:0000:0000:0000:0000 - fd42:4992:6a6d:ffff:ffff:ffff:ffff:ffff
-netname:            EVE-NETWORK
-descr:              Network of eve
-country:            DE
-admin-c:            MIC92-DN42
-tech-c:             MIC92-DN42
-mnt-by:             MIC92-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
-status:             ASSIGNED
-cidr:               fd42:4992:6a6d::/48
-source:             DN42
diff --git a/data/inet6num/fd42:4999:6a6d::_48 b/data/inet6num/fd42:4999:6a6d::_48
index 5f1f64e19..a6f987288 100644
--- a/data/inet6num/fd42:4999:6a6d::_48
+++ b/data/inet6num/fd42:4999:6a6d::_48
@@ -6,7 +6,5 @@ country:            CN
 admin-c:            OO11-DN42
 tech-c:             OO11-DN42
 mnt-by:             OO11-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inet6num/fd42:68c2:8747::_48 b/data/inet6num/fd42:68c2:8747::_48
new file mode 100644
index 000000000..f1b61d3dd
--- /dev/null
+++ b/data/inet6num/fd42:68c2:8747::_48
@@ -0,0 +1,11 @@
+inet6num:           fd42:68c2:8747:0000:0000:0000:0000:0000 - fd42:68c2:8747:ffff:ffff:ffff:ffff:ffff
+cidr:               fd42:68c2:8747::/48
+netname:            DOZENCLOUD-NETWORK
+descr:              Network of DozenCloud
+country:            TW
+admin-c:            DOZENCLOUD-DN42
+tech-c:             DOZENCLOUD-DN42
+mnt-by:             DOZENCLOUD-MNT
+nserver:            ns1.dozencloud.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inet6num/fd42:c0de:3a2f::_48 b/data/inet6num/fd42:c0de:3a2f::_48
index 7c720eb13..4e0d2992e 100644
--- a/data/inet6num/fd42:c0de:3a2f::_48
+++ b/data/inet6num/fd42:c0de:3a2f::_48
@@ -5,7 +5,6 @@ country:            US
 admin-c:            ICZERO-DN42
 tech-c:             ICZERO-DN42
 mnt-by:             VALORAN-MNT
-nserver:            ns2.evenet.dn42
 status:             ALLOCATED
 cidr:               fd42:c0de:3a2f::/48
 source:             DN42
diff --git a/data/inet6num/fd42:c0de:6a6d::_48 b/data/inet6num/fd42:c0de:6a6d::_48
index f63eb5092..e591aefee 100644
--- a/data/inet6num/fd42:c0de:6a6d::_48
+++ b/data/inet6num/fd42:c0de:6a6d::_48
@@ -5,7 +5,6 @@ country:            AR
 admin-c:            IOVOID-DN42
 tech-c:             IOVOID-DN42
 mnt-by:             VALORAN-MNT
-nserver:            ns2.evenet.dn42
 status:             ALLOCATED
 cidr:               fd42:c0de:6a6d::/48
 source:             DN42
diff --git a/data/inet6num/fd42:da:1ab::_48 b/data/inet6num/fd42:da:1ab::_48
index 4cc66dddc..ab364f993 100644
--- a/data/inet6num/fd42:da:1ab::_48
+++ b/data/inet6num/fd42:da:1ab::_48
@@ -5,7 +5,6 @@ country:            DE
 admin-c:            TUDAISPLABCLASSIC-DN42
 tech-c:             TUDAISPLABCLASSIC-DN42
 mnt-by:             TUDA-ISPLAB-CLASSIC-MNT
-nserver:            ns1.evenet.dn42
 status:             ASSIGNED
 cidr:               fd42:da:1ab::/48
 source:             DN42
diff --git a/data/inet6num/fd42:f7b1:1078::_48 b/data/inet6num/fd42:f7b1:1078::_48
new file mode 100644
index 000000000..cee993217
--- /dev/null
+++ b/data/inet6num/fd42:f7b1:1078::_48
@@ -0,0 +1,11 @@
+inet6num:           fd42:f7b1:1078:0000:0000:0000:0000:0000 - fd42:f7b1:1078:ffff:ffff:ffff:ffff:ffff
+cidr:               fd42:f7b1:1078::/48
+netname:            WHMCR-NETWORK
+descr:              WHMCR - Home Network
+country:            GB
+admin-c:            WHMCR-DN42
+tech-c:             WHMCR-DN42
+mnt-by:             WHMCR-MNT
+nserver:            ns1.whmcr.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inet6num/fd79:300d:6056::_48 b/data/inet6num/fd79:300d:6056::_48
index 67533552e..a586a35a5 100644
--- a/data/inet6num/fd79:300d:6056::_48
+++ b/data/inet6num/fd79:300d:6056::_48
@@ -4,8 +4,6 @@ country:            DE
 admin-c:            FOOKER-DN42
 tech-c:             FOOKER-DN42
 mnt-by:             FOOKER-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 cidr:               fd79:300d:6056::/48
 source:             DN42
diff --git a/data/inet6num/fdbb:baba:2468::_48 b/data/inet6num/fdbb:baba:2468::_48
new file mode 100644
index 000000000..692a1e658
--- /dev/null
+++ b/data/inet6num/fdbb:baba:2468::_48
@@ -0,0 +1,11 @@
+inet6num:           fdbb:baba:2468:0000:0000:0000:0000:0000 - fdbb:baba:2468:ffff:ffff:ffff:ffff:ffff
+cidr:               fdbb:baba:2468::/48
+netname:            BAUEN1-NETWORK-IPV6
+descr:              bauen1 network ipv6
+country:            DE
+admin-c:            BAUEN1-DN42
+tech-c:             BAUEN1-DN42
+mnt-by:             BAUEN1-MNT
+nserver:            ns1.bnet.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inet6num/fdda:eafa:15ce::_48 b/data/inet6num/fdda:eafa:15ce::_48
index dec9dafc0..1b9fe3e1d 100644
--- a/data/inet6num/fdda:eafa:15ce::_48
+++ b/data/inet6num/fdda:eafa:15ce::_48
@@ -5,8 +5,6 @@ country:            DK
 admin-c:            DENNIS-DN42
 tech-c:             DENNIS-DN42
 mnt-by:             DENNIS-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 cidr:               fdda:eafa:15ce::/48
 source:             DN42
diff --git a/data/inet6num/fdf5:b4f8:1e89::_48 b/data/inet6num/fdf5:b4f8:1e89::_48
index 0be312e95..cead97699 100644
--- a/data/inet6num/fdf5:b4f8:1e89::_48
+++ b/data/inet6num/fdf5:b4f8:1e89::_48
@@ -6,7 +6,5 @@ country:            DK
 admin-c:            YOURDADDY-DN42
 tech-c:             YOURDADDY-DN42
 mnt-by:             YOURDADDY-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 source:             DN42
 status:             ASSIGNED
diff --git a/data/inet6num/fdfd:d0b7:5feb::_48 b/data/inet6num/fdfd:d0b7:5feb::_48
new file mode 100644
index 000000000..95264fe26
--- /dev/null
+++ b/data/inet6num/fdfd:d0b7:5feb::_48
@@ -0,0 +1,11 @@
+inet6num:           fdfd:d0b7:5feb:0000:0000:0000:0000:0000 - fdfd:d0b7:5feb:ffff:ffff:ffff:ffff:ffff
+cidr:               fdfd:d0b7:5feb::/48
+netname:            RMNTN-NET-IPV6
+descr:              Remonton Network IPv6 block
+org:                ORG-RMNTN
+admin-c:            RACOMAIZER-DN42
+tech-c:             RACOMAIZER-DN42
+mnt-by:             RMNTN-MNT
+nserver:            ns.as1873.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inet6num/fdfd:face:4ace::_48 b/data/inet6num/fdfd:face:4ace::_48
index 8ed85544d..ca28dbdbd 100644
--- a/data/inet6num/fdfd:face:4ace::_48
+++ b/data/inet6num/fdfd:face:4ace::_48
@@ -5,7 +5,6 @@ country:            NL
 admin-c:            LUKEREIJ-DN42
 tech-c:             LUKEREIJ-DN42
 mnt-by:             BYLUKE-MNT
-nserver:            ns1.evenet.dn42
 status:             ASSIGNED
 cidr:               fdfd:face:4ace::/48
 source:             DN42
diff --git a/data/inetnum/172.20.128.80_29 b/data/inetnum/172.20.128.80_29
index 22ce50b53..033ccd411 100644
--- a/data/inetnum/172.20.128.80_29
+++ b/data/inetnum/172.20.128.80_29
@@ -1,7 +1,7 @@
 inetnum:            172.20.128.80 - 172.20.128.87
 netname:            NETRAVNEN-NETWORK-VIRTUAL-LAB
-admin-c:            NETRAVNEN-DN42
-tech-c:             NETRAVNEN-DN42
+admin-c:            ORG-NETRAVNEN-DN42
+tech-c:             ORG-NETRAVNEN-DN42
 mnt-by:             NETRAVNEN-MNT
 status:             ASSIGNED
 cidr:               172.20.128.80/29
diff --git a/data/inetnum/172.20.13.128_27 b/data/inetnum/172.20.13.128_27
index f6180410c..d51af885d 100644
--- a/data/inetnum/172.20.13.128_27
+++ b/data/inetnum/172.20.13.128_27
@@ -3,7 +3,6 @@ netname:            ASTR0BOY-NET
 admin-c:            ASTR0BOY-DN42
 tech-c:             ASTR0BOY-DN42
 mnt-by:             ASTR0BOY-MNT
-nserver:            ns1.evenet.dn42
 status:             ASSIGNED
 cidr:               172.20.13.128/27
 source:             DN42
diff --git a/data/inetnum/172.20.13.160_27 b/data/inetnum/172.20.13.160_27
index 90d7d290d..5ea4d8729 100644
--- a/data/inetnum/172.20.13.160_27
+++ b/data/inetnum/172.20.13.160_27
@@ -4,7 +4,5 @@ netname:            Optic Network
 admin-c:            OPTIC-DN42
 tech-c:             OPTIC-DN42
 mnt-by:             OPTIC-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.20.14.128_27 b/data/inetnum/172.20.14.128_27
index 9657ac3cf..0a079ed19 100644
--- a/data/inetnum/172.20.14.128_27
+++ b/data/inetnum/172.20.14.128_27
@@ -2,8 +2,6 @@ inetnum:            172.20.14.128 - 172.20.14.159
 admin-c:            FRCE-DN42
 tech-c:             FRCE-DN42
 mnt-by:             MFORCE-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 cidr:               172.20.14.128/27
 netname:            evennet network
diff --git a/data/inetnum/172.20.149.136_29 b/data/inetnum/172.20.149.136_29
index e795f18c0..a30306a78 100644
--- a/data/inetnum/172.20.149.136_29
+++ b/data/inetnum/172.20.149.136_29
@@ -5,8 +5,6 @@ country:            GB
 admin-c:            RSDOHERTY-DN42
 tech-c:             RSDOHERTY-DN42
 mnt-by:             RSDOHERTY-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 cidr:               172.20.149.136/29
 source:             DN42
diff --git a/data/inetnum/172.20.160.64_26 b/data/inetnum/172.20.160.64_26
new file mode 100644
index 000000000..75fccce39
--- /dev/null
+++ b/data/inetnum/172.20.160.64_26
@@ -0,0 +1,10 @@
+inetnum:            172.20.160.64 - 172.20.160.127
+cidr:               172.20.160.64/26
+netname:            AOTOKI-NETWORK
+admin-c:            AOTOKI-DN42
+tech-c:             AOTOKI-DN42
+mnt-by:             AOTOKI-MNT
+nserver:            ns1.aotoki.dn42
+nserver:            ns2.aotoki.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.20.18.224_28 b/data/inetnum/172.20.18.224_28
new file mode 100644
index 000000000..4b4487555
--- /dev/null
+++ b/data/inetnum/172.20.18.224_28
@@ -0,0 +1,11 @@
+inetnum:            172.20.18.224 - 172.20.18.239
+cidr:               172.20.18.224/28
+netname:            BAUEN1-NETWORK-IPV4
+descr:              bauen1 network ipv4
+country:            DE
+admin-c:            BAUEN1-DN42
+tech-c:             BAUEN1-DN42
+mnt-by:             BAUEN1-MNT
+nserver:            ns1.bnet.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.20.183.32_29 b/data/inetnum/172.20.183.32_29
index fb4df0e82..b55a58912 100644
--- a/data/inetnum/172.20.183.32_29
+++ b/data/inetnum/172.20.183.32_29
@@ -5,8 +5,6 @@ country:            GB
 admin-c:            RSDOHERTY-DN42
 tech-c:             RSDOHERTY-DN42
 mnt-by:             RSDOHERTY-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 cidr:               172.20.183.32/29
 source:             DN42
diff --git a/data/inetnum/172.20.191.0_26 b/data/inetnum/172.20.191.0_26
index 2469d74f5..fae8fa593 100644
--- a/data/inetnum/172.20.191.0_26
+++ b/data/inetnum/172.20.191.0_26
@@ -5,8 +5,6 @@ country:            CA
 admin-c:            JUNIPERRC-DN42
 tech-c:             JUNIPERRC-DN42
 mnt-by:             RACHA2000-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 cidr:               172.20.191.0/26
 source:             DN42
diff --git a/data/inetnum/172.20.227.160_28 b/data/inetnum/172.20.227.160_28
index 25f2891ca..11c596253 100644
--- a/data/inetnum/172.20.227.160_28
+++ b/data/inetnum/172.20.227.160_28
@@ -3,8 +3,6 @@ netname:            TAYLES-NETWORK
 admin-c:            TAYLES-DN42
 tech-c:             TAYLES-DN42
 mnt-by:             TAYLES-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 cidr:               172.20.227.160/28
 source:             DN42
diff --git a/data/inetnum/172.20.229.64_27 b/data/inetnum/172.20.229.64_27
index fddfabaa1..28f0e2a1b 100644
--- a/data/inetnum/172.20.229.64_27
+++ b/data/inetnum/172.20.229.64_27
@@ -3,7 +3,6 @@ netname:            JDS-NET
 admin-c:            JDS-DN42
 tech-c:             JDS-DN42
 mnt-by:             JDS-MNT
-nserver:            ns1.evenet.dn42
 status:             ASSIGNED
 cidr:               172.20.229.64/27
 source:             DN42
diff --git a/data/inetnum/172.20.234.240_28 b/data/inetnum/172.20.234.240_28
index a95b218e9..013d8108d 100644
--- a/data/inetnum/172.20.234.240_28
+++ b/data/inetnum/172.20.234.240_28
@@ -4,7 +4,5 @@ netname:            A3K-NETWORK
 admin-c:            A3K-DN42
 tech-c:             A3K-DN42
 mnt-by:             A3K-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.20.239.192_27 b/data/inetnum/172.20.239.192_27
index 56cd4f5ad..a7a96eded 100644
--- a/data/inetnum/172.20.239.192_27
+++ b/data/inetnum/172.20.239.192_27
@@ -3,7 +3,7 @@ cidr:               172.20.239.192/27
 netname:            SARU-MOE
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 nserver:            lb.ns.saru.dn42
 nserver:            saru.ns.saru.dn42
 nserver:            hebi.ns.saru.dn42
diff --git a/data/inetnum/172.20.240.192_26 b/data/inetnum/172.20.240.192_26
index 318b24d49..32657ecd6 100644
--- a/data/inetnum/172.20.240.192_26
+++ b/data/inetnum/172.20.240.192_26
@@ -5,7 +5,6 @@ country:            CN
 admin-c:            LAIN-DN42
 tech-c:             LAIN-DN42
 mnt-by:             LAIN-MNT
-nserver:            ns1.evenet.dn42
 status:             ASSIGNED
 bgp-status:         ignore
 cidr:               172.20.240.192/26
diff --git a/data/inetnum/172.20.252.0_24 b/data/inetnum/172.20.252.0_24
index a433acc15..3d0fe0741 100644
--- a/data/inetnum/172.20.252.0_24
+++ b/data/inetnum/172.20.252.0_24
@@ -5,7 +5,6 @@ country:            DE
 admin-c:            JAJO-DN42
 tech-c:             JAJO-DN42
 mnt-by:             JAJO-MNT
-nserver:            ns1.evenet.dn42
 status:             ASSIGNED
 bgp-status:         ignore
 cidr:               172.20.252.0/24
diff --git a/data/inetnum/172.20.45.64_28 b/data/inetnum/172.20.45.64_28
index 52fe4d714..4f7ab5b45 100644
--- a/data/inetnum/172.20.45.64_28
+++ b/data/inetnum/172.20.45.64_28
@@ -6,7 +6,5 @@ admin-c:            XICONFJS-DN42
 tech-c:             XICONFJS-DN42
 mnt-by:             XICON-MNT
 status:             ASSIGNED
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 cidr:               172.20.45.64/28
 source:             DN42
diff --git a/data/inetnum/172.20.47.128_28 b/data/inetnum/172.20.47.128_28
new file mode 100644
index 000000000..6f26faec0
--- /dev/null
+++ b/data/inetnum/172.20.47.128_28
@@ -0,0 +1,9 @@
+inetnum:            172.20.47.128 - 172.20.47.143
+cidr:               172.20.47.128/28
+netname:            WHMCR - Home network
+admin-c:            WHMCR-DN42
+tech-c:             WHMCR-DN42
+mnt-by:             WHMCR-MNT
+nserver:            ns1.whmcr.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.20.53.32_27 b/data/inetnum/172.20.53.32_27
index f4d510f73..940b92d9d 100644
--- a/data/inetnum/172.20.53.32_27
+++ b/data/inetnum/172.20.53.32_27
@@ -4,7 +4,5 @@ netname:            OO11-NETWORK
 admin-c:            OO11-DN42
 tech-c:             OO11-DN42
 mnt-by:             OO11-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.21.79.64_28 b/data/inetnum/172.21.79.64_28
new file mode 100644
index 000000000..995a3df73
--- /dev/null
+++ b/data/inetnum/172.21.79.64_28
@@ -0,0 +1,11 @@
+inetnum:            172.21.79.64 - 172.21.79.79
+cidr:               172.21.79.64/28
+netname:            RMNTN-NET-IPV4-ACCESS
+descr:              Remonton Network IPv4 Access Block
+org:                ORG-RMNTN
+admin-c:            RACOMAIZER-DN42
+tech-c:             RACOMAIZER-DN42
+mnt-by:             RMNTN-MNT
+nserver:            ns.as1873.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.22.100.0_24 b/data/inetnum/172.22.100.0_24
index 22bb4d36e..e079fe03a 100644
--- a/data/inetnum/172.22.100.0_24
+++ b/data/inetnum/172.22.100.0_24
@@ -1,9 +1,12 @@
 inetnum:            172.22.100.0 - 172.22.100.255
 netname:            C3D2-WETU
 country:            DE
-admin-c:            MIC92-DN42
-tech-c:             MIC92-DN42
-mnt-by:             MIC92-MNT
+admin-c:            ASTRO-DN42
+admin-c:            ERI-DN42
+tech-c:             ASTRO-DN42
+tech-c:             ERI-DN42
+mnt-by:             ASTRO-MNT
+mnt-by:             ERI-MNT
 status:             ASSIGNED
 cidr:               172.22.100.0/24
 source:             DN42
diff --git a/data/inetnum/172.22.128.0_27 b/data/inetnum/172.22.128.0_27
index c39e988c2..43e97a527 100644
--- a/data/inetnum/172.22.128.0_27
+++ b/data/inetnum/172.22.128.0_27
@@ -1,7 +1,7 @@
 inetnum:            172.22.128.0 - 172.22.128.31
 netname:            NETRAVNEN-TRANSIT-PEERING-NET
-admin-c:            NETRAVNEN-DN42
-tech-c:             NETRAVNEN-DN42
+admin-c:            ORG-NETRAVNEN-DN42
+tech-c:             ORG-NETRAVNEN-DN42
 mnt-by:             NETRAVNEN-MNT
 status:             ASSIGNED
 cidr:               172.22.128.0/27
diff --git a/data/inetnum/172.22.128.32_27 b/data/inetnum/172.22.128.32_27
index 08e062a91..82743b751 100644
--- a/data/inetnum/172.22.128.32_27
+++ b/data/inetnum/172.22.128.32_27
@@ -1,7 +1,7 @@
 inetnum:            172.22.128.32 - 172.22.128.63
 netname:            NETRAVNEN-NET
-admin-c:            NETRAVNEN-DN42
-tech-c:             NETRAVNEN-DN42
+admin-c:            ORG-NETRAVNEN-DN42
+tech-c:             ORG-NETRAVNEN-DN42
 mnt-by:             NETRAVNEN-MNT
 status:             ASSIGNED
 cidr:               172.22.128.32/27
diff --git a/data/inetnum/172.22.131.0_27 b/data/inetnum/172.22.131.0_27
index 84b27e308..ad4c3cd51 100644
--- a/data/inetnum/172.22.131.0_27
+++ b/data/inetnum/172.22.131.0_27
@@ -5,7 +5,6 @@ country:            NO
 admin-c:            EKMAN-DN42
 tech-c:             EKMAN-DN42
 mnt-by:             EKMAN-MNT
-nserver:            ns1.evenet.dn42
 status:             ASSIGNED
 cidr:               172.22.131.0/27
 source:             DN42
diff --git a/data/inetnum/172.22.135.32_27 b/data/inetnum/172.22.135.32_27
index 8c1019093..24a931c58 100644
--- a/data/inetnum/172.22.135.32_27
+++ b/data/inetnum/172.22.135.32_27
@@ -4,7 +4,5 @@ netname:            JUMBLE-NETWORK
 admin-c:            JUMBLE-DN42
 tech-c:             JUMBLE-DN42
 mnt-by:             JUMBLE-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.22.146.0_25 b/data/inetnum/172.22.146.0_25
index fba89f5b1..5b5ff279f 100644
--- a/data/inetnum/172.22.146.0_25
+++ b/data/inetnum/172.22.146.0_25
@@ -4,7 +4,5 @@ netname:            TECHNOPOINT CORE NETWORK POOL FOR DN42
 admin-c:            KM17-DN42
 tech-c:             KM17-DN42
 mnt-by:             TECHNOPOINT-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.22.149.0_28 b/data/inetnum/172.22.149.0_28
index 69222809a..6c9947366 100644
--- a/data/inetnum/172.22.149.0_28
+++ b/data/inetnum/172.22.149.0_28
@@ -4,7 +4,5 @@ netname:            POTATSO-NETWORK
 admin-c:            POTATSO-DN42
 tech-c:             POTATSO-DN42
 mnt-by:             POTATSO-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.22.181.0_25 b/data/inetnum/172.22.181.0_25
new file mode 100644
index 000000000..cf0a17a5a
--- /dev/null
+++ b/data/inetnum/172.22.181.0_25
@@ -0,0 +1,11 @@
+inetnum:            172.22.181.0 - 172.22.181.127
+cidr:               172.22.181.0/25
+netname:            RMNTN-NET-IPV4-CORE
+descr:              Remonton Network IPv4 Core Block
+org:                ORG-RMNTN
+admin-c:            RACOMAIZER-DN42
+tech-c:             RACOMAIZER-DN42
+mnt-by:             RMNTN-MNT
+nserver:            ns.as1873.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.22.188.192_27 b/data/inetnum/172.22.188.192_27
index ab6dfb3e6..44043d055 100644
--- a/data/inetnum/172.22.188.192_27
+++ b/data/inetnum/172.22.188.192_27
@@ -9,8 +9,6 @@ country:            DE
 admin-c:            FE42-DN42
 tech-c:             FE42-DN42
 mnt-by:             NJIS-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 cidr:               172.22.188.192/27
 source:             DN42
diff --git a/data/inetnum/172.22.98.0_28 b/data/inetnum/172.22.98.0_28
index 5b09ca690..bc2fe9ee2 100644
--- a/data/inetnum/172.22.98.0_28
+++ b/data/inetnum/172.22.98.0_28
@@ -4,8 +4,6 @@ country:            UA
 admin-c:            ABB-DN42
 tech-c:             ABB-DN42
 mnt-by:             ABBON-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 cidr:               172.22.98.0/28
 source:             DN42
diff --git a/data/inetnum/172.23.120.0_28 b/data/inetnum/172.23.120.0_28
index 855b5ee6e..2577785ac 100644
--- a/data/inetnum/172.23.120.0_28
+++ b/data/inetnum/172.23.120.0_28
@@ -5,7 +5,6 @@ country:            NL
 admin-c:            LUKEREIJ-DN42
 tech-c:             LUKEREIJ-DN42
 mnt-by:             BYLUKE-MNT
-nserver:            ns1.evenet.dn42
 status:             ASSIGNED
 cidr:               172.23.120.0/28
 source:             DN42
diff --git a/data/inetnum/172.23.173.0_27 b/data/inetnum/172.23.173.0_27
new file mode 100644
index 000000000..9b47a5bb5
--- /dev/null
+++ b/data/inetnum/172.23.173.0_27
@@ -0,0 +1,9 @@
+inetnum:            172.23.173.0 - 172.23.173.31
+cidr:               172.23.173.0/27
+netname:            DOZENCLOUD-NETWORK
+admin-c:            DOZENCLOUD-DN42
+tech-c:             DOZENCLOUD-DN42
+mnt-by:             DOZENCLOUD-MNT
+nserver:            ns1.dozencloud.dn42
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.23.200.0_24 b/data/inetnum/172.23.200.0_24
index 3712238ea..832efdb32 100644
--- a/data/inetnum/172.23.200.0_24
+++ b/data/inetnum/172.23.200.0_24
@@ -4,8 +4,6 @@ country:            DE
 admin-c:            FOOKER-DN42
 tech-c:             FOOKER-DN42
 mnt-by:             FOOKER-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 cidr:               172.23.200.0/24
 source:             DN42
diff --git a/data/inetnum/172.23.75.0_24 b/data/inetnum/172.23.75.0_24
deleted file mode 100644
index 3988a43ac..000000000
--- a/data/inetnum/172.23.75.0_24
+++ /dev/null
@@ -1,10 +0,0 @@
-inetnum:            172.23.75.0 - 172.23.75.255
-netname:            EVE-NETWORK
-admin-c:            MIC92-DN42
-tech-c:             MIC92-DN42
-mnt-by:             MIC92-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
-status:             ASSIGNED
-cidr:               172.23.75.0/24
-source:             DN42
diff --git a/data/inetnum/172.23.84.0_27 b/data/inetnum/172.23.84.0_27
index 9f8c7b59b..11f1bc6ae 100644
--- a/data/inetnum/172.23.84.0_27
+++ b/data/inetnum/172.23.84.0_27
@@ -4,7 +4,5 @@ netname:            BGP1-NETWORK
 admin-c:            BGP1-DN42
 tech-c:             BGP1-DN42
 mnt-by:             BGP1-MNT
-nserver:            ns1.evenet.dn42
-nserver:            ns2.evenet.dn42
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.31.0.91_32 b/data/inetnum/172.31.0.91_32
new file mode 100644
index 000000000..49119bc9d
--- /dev/null
+++ b/data/inetnum/172.31.0.91_32
@@ -0,0 +1,9 @@
+inetnum:            172.31.0.91 - 172.31.0.91
+cidr:               172.31.0.91/32
+netname:            IMPORTED-FROM-CHAOSVPN
+bgp-status:         ignore
+nserver:            ns1.chaosvpn.g.nic.dn42
+nserver:            ns2.chaosvpn.g.nic.dn42
+remarks:            Imported from chaosvpn, do not edit!
+mnt-by:             DN42-MNT
+source:             CHAOSVPN
diff --git a/data/inetnum/172.31.86.0_24 b/data/inetnum/172.31.86.0_24
new file mode 100644
index 000000000..9bee6cc59
--- /dev/null
+++ b/data/inetnum/172.31.86.0_24
@@ -0,0 +1,9 @@
+inetnum:            172.31.86.0 - 172.31.86.255
+cidr:               172.31.86.0/24
+netname:            IMPORTED-FROM-CHAOSVPN
+bgp-status:         ignore
+nserver:            ns1.chaosvpn.g.nic.dn42
+nserver:            ns2.chaosvpn.g.nic.dn42
+remarks:            Imported from chaosvpn, do not edit!
+mnt-by:             DN42-MNT
+source:             CHAOSVPN
diff --git a/data/mntner/AOTOKI-MNT b/data/mntner/AOTOKI-MNT
new file mode 100644
index 000000000..3771015f3
--- /dev/null
+++ b/data/mntner/AOTOKI-MNT
@@ -0,0 +1,7 @@
+mntner:             AOTOKI-MNT
+auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC06V1gAM7nWlJ3GBvpWHT+mgyJEVOQHCX8nV0ylttKzcvDAXqa1WoytDGoER3mM+J0rtBX+5Bu+W1Rj+T9H4nACtAXKBPtmYtEV5y7gOuOa6x2ceW60jLERVgFhs56Duz8I5kwWJrKICdosnit26si7HM9xBFmImd+V9FXtaR1ePIvoz0KnZtJqYIEH2Wmh/KhClhbNtSKfK+yTN7j1UrreUc+Ujdd5UXj1NroroVNcMwtBS73PDd06BLrFLKO0mRSxCJgvaCHO2jqY6DZgXFUz522zzSEZtkp2NpZO+9N10XwhrDkx2GWmcfQ3Bq1GzP0BRWBRsN/pgOqBoz9S30l elct9620@cangshixianyedeMacBook-Pro.local
+auth:               pgp-fingerprint 31EFF3CDB6B5A96551251F1BC66BB09725189453
+admin-c:            AOTOKI-DN42
+tech-c:             AOTOKI-DN42
+mnt-by:             AOTOKI-MNT
+source:             DN42
diff --git a/data/mntner/BAUEN1-MNT b/data/mntner/BAUEN1-MNT
new file mode 100644
index 000000000..e964dfc05
--- /dev/null
+++ b/data/mntner/BAUEN1-MNT
@@ -0,0 +1,8 @@
+mntner:             BAUEN1-MNT
+descr:              bauen1
+auth:               pgp-fingerprint 5ED6D826ACD43F8ED9D4FBB2FF0AAF5E0812BA9C
+auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFdPPmuR5L02udCuqpWLez4FGr6B9lk87qCRiuZzpHRMVniaNBVTV8aoysW4iTn639x/Gavp49i7oIca8tpn+HBM4wirZ1RQWNqwcnrYYaAuAhBC93vidL+XxXcflUw/BfKEmvNGa3CgxXv+HEL0Wq/FWvPLKZ8fHnmKv0VYfqkOE6VsTbXRsNxo+Z0Q1+GX5FsqPYuZPu4qLbtVKpLLCtJhXBHEVe+bSm0+VSZmaYYxvUC33sfpLUupmwC1Kkkl2g9k0+OiaEji2tm3ZgxFoeLUOhX1zKT6thBhalvN/7+pCMeqxyr68uuz25ZGmaXtsW528k729vAgJ/aSJ1m1pH jh@jh-mba-debian
+admin-c:            BAUEN1-DN42
+tech-c:             BAUEN1-DN42
+mnt-by:             BAUEN1-MNT
+source:             DN42
diff --git a/data/mntner/DOZENCLOUD-MNT b/data/mntner/DOZENCLOUD-MNT
new file mode 100644
index 000000000..7f1074044
--- /dev/null
+++ b/data/mntner/DOZENCLOUD-MNT
@@ -0,0 +1,6 @@
+mntner:             DOZENCLOUD-MNT
+admin-c:            DOZENCLOUD-DN42
+tech-c:             DOZENCLOUD-DN42
+mnt-by:             DOZENCLOUD-MNT
+auth:               pgp-fingerprint 6FF60096C94F50058CF9683C24C16528B177BEFB
+source:             DN42
diff --git a/data/mntner/MIC92-MNT b/data/mntner/MIC92-MNT
deleted file mode 100644
index 96e5c1ea5..000000000
--- a/data/mntner/MIC92-MNT
+++ /dev/null
@@ -1,8 +0,0 @@
-mntner:             MIC92-MNT
-descr:              Mic92 maintains
-sha512-pw:          YzRiOGNhMGI1ZjRmMmMyOGJhNTc3NDRlNjZjYjBkNDIwYjQ2ZmE5YjMwYTg1MTk3YmExMjYyNmZhZDE3NmU0NDA4ODJiMDRjODQxOTg1MWIwNGVlZjk2Y2RmZmNiMWU3MDJhY2I0YjE0MGZlYjYyZTBhNjZjM2JiMTcxYTdhYWE0MTAyYjg3Mzk1ODI2MzQ3ZWQzYjgxYzJmMTdjMGU3ZGI4ODgxOTAyMDMyODRlOTcxMzg1YzBlMDAwOTlhOTc0MWZjYjU4NzdlZjA0MDczZjMxZThkYzFmMmFiZmY4NzljMzAwZjhkNjM0ZTE3OTU3ODY4ZmFhNjY3OTJkMjcwN2UxM2ZlMGIxY2MwMWFmMzMxN2Q3NzAyZmI5N2JkNmU4ZmRkOWQ0MjI0MzgzNzM5NWFhMzUwYTZkNGZlZmY4MThjNTYxZGU3ZDQ3NzQ2NDM5MDFkZTMxMzkwNGQxNTBlMTk1OGRmYjIzOWI1ZmFmZTI2YzkzY2FmOTgzZTIyZmI2ZjYyMjg2NjMzNTA5NjIwYjEzYmFlYTYyYmY2MDg4YmJlNDU1MzAyYWI3Njc1NDk4NTUyNDUyMzBhNDI2Y2NmMDAzZmY2Njk0NzYzMGRiOTQ3MjkyNjM2Y2M0ZjNmYjllODM3ZDgwMDA4OWQ1YzI2YzczMmVkMWZkODY3YmI0OTA=
-admin-c:            MIC92-DN42
-tech-c:             MIC92-DN42
-mnt-by:             MIC92-MNT
-remarks:            pin-sha256:DO6bhBqJ7A83RWGiY7lmiqcM2f6mD5yq1IBrCHqPY9o=
-source:             DN42
diff --git a/data/mntner/NETRAVNEN-MNT b/data/mntner/NETRAVNEN-MNT
index 3550d1fbe..d17a1fa47 100644
--- a/data/mntner/NETRAVNEN-MNT
+++ b/data/mntner/NETRAVNEN-MNT
@@ -1,6 +1,6 @@
 mntner:             NETRAVNEN-MNT
-admin-c:            NETRAVNEN-DN42
-tech-c:             NETRAVNEN-DN42
+admin-c:            ORG-NETRAVNEN-DN42
+tech-c:             ORG-NETRAVNEN-DN42
 mnt-by:             NETRAVNEN-MNT
 auth:               pgp-fingerprint C8B382A8A1CDCDB771FEB24CC654948FDA86BECD
 source:             DN42
diff --git a/data/mntner/RMNTN-MNT b/data/mntner/RMNTN-MNT
new file mode 100644
index 000000000..e3f3be7db
--- /dev/null
+++ b/data/mntner/RMNTN-MNT
@@ -0,0 +1,7 @@
+mntner:             RMNTN-MNT
+descr:              Lemon Network Solutions maintainer object
+auth:               pgp-fingerprint ECE8C3CEB6D9D8B40744F5ED5FE94D68FA83B5BA
+admin-c:            RACOMAIZER-DN42
+tech-c:             RACOMAIZER-DN42
+mnt-by:             RMNTN-MNT
+source:             DN42
diff --git a/data/mntner/SARU-MOE-MNT b/data/mntner/SARU-MNT
similarity index 95%
rename from data/mntner/SARU-MOE-MNT
rename to data/mntner/SARU-MNT
index ce6bd7640..3af3caeed 100644
--- a/data/mntner/SARU-MOE-MNT
+++ b/data/mntner/SARU-MNT
@@ -1,4 +1,4 @@
-mntner:             SARU-MOE-MNT
+mntner:             SARU-MNT
 auth:               pgp-fingerprint AF3165DE7ABAD04F9250756E9147806CAF74BA71
 remarks:            ## most git commits signed with subkey below ##
 auth:               pgp-fingerprint 58C64BFA32613A034171C73351171AD7A66BDD51
@@ -9,5 +9,5 @@ remarks:            ## for ASIX ##
 remarks:            ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCru/iumrZ/wNzwK73DKVnas1MCBi1u1DDc+U67bQrXO3o9A9N+6IYG3rQQXMhLNKlUKRhFnLx5iolREB2BhjKlfKNsmY369DZtWi1usnzj3SwKoBXI28OyFwPL9w+X9nqUuMpp26SL1Hj0ZOmy4iKviyDWE29oll6FwfyEkFKwlziDGzNlG9Mlz4BFP2Q5dts4YPJpHxGZddWwEUIPwganNNDYSX0s6EZaQK3VFoyxISuETTFY3pREDriLclDPC54FONmrrAM1rGI8DchK7rQeXEbyk/wNtnYygtEJQAPpU0ErknHNGeYdW/gWmmfjlY7lSI+42jjE1U6mdsU2RwrT DN42-ASIX
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 source:             DN42
diff --git a/data/mntner/SNEK-MNT b/data/mntner/SNEK-MNT
index 4334e51d3..ef8b611d4 100644
--- a/data/mntner/SNEK-MNT
+++ b/data/mntner/SNEK-MNT
@@ -3,4 +3,5 @@ admin-c:            SNEK-DN42
 tech-c:             SNEK-DN42
 mnt-by:             SNEK-MNT
 auth:               pgp-fingerprint 24E8BBD2DA10B312CF164CA258CCE2A24E2D41DC
+remarks:            pin-sha256:mzkOsH37p+JeJLRICX7V8J1lNmXM2sqZGtqebHYz8sg=
 source:             DN42
diff --git a/data/mntner/WHMCR-MNT b/data/mntner/WHMCR-MNT
new file mode 100644
index 000000000..bc96d00e2
--- /dev/null
+++ b/data/mntner/WHMCR-MNT
@@ -0,0 +1,7 @@
+mntner:             WHMCR-MNT
+admin-c:            WHMCR-DN42
+tech-c:             WHMCR-DN42
+mnt-by:             WHMCR-MNT
+auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCs7NOZJOLU3JwFouYlSofHpAHKjMKkkLs2VSGXwpO8uFs4QoCePGMGC1HM29MIrJ4clwz/+EO1JjAVnOKudvjm6GBOHOKZNeB6Rb+aGpU5iSTCVUj3ACo7/o488m6BpKWqtpzY8p9MhQ//cmMOqIWIYgisG+S1mDtV+jq+TOu22xY7+H5jkebRRKGprfVxnYaN//JpmQoa25nC4Vs9p4Ikii9unCa8vDY5giZ15j0tm9kcwT6vawMmXiLYfIwfWGijSnYWTE22pW7/eoKhsYgsQG8Q3Izq9/xanoUHN0g/5Z1X1P+FRdceKmVbZzmH85I6+9LXZhlfbYV49CwDmL3T whmcr@home
+auth:               pgp-fingerprint C55A8C4E0F8870365DF53D78FED8C9364B79214F
+source:             DN42
diff --git a/data/organisation/ORG-NETRAVNEN b/data/organisation/ORG-NETRAVNEN
index f950e457f..ddf405992 100644
--- a/data/organisation/ORG-NETRAVNEN
+++ b/data/organisation/ORG-NETRAVNEN
@@ -1,8 +1,8 @@
 organisation:       ORG-NETRAVNEN
 org-name:           NETRAVNEN Organization
-admin-c:            NETRAVNEN-DN42
-tech-c:             NETRAVNEN-DN42
-abuse-c:            NETRAVNEN-DN42
+admin-c:            ORG-NETRAVNEN-DN42
+tech-c:             ORG-NETRAVNEN-DN42
+abuse-c:            ORG-NETRAVNEN-DN42
 e-mail:             netravnen@netravnen.org
 mnt-by:             NETRAVNEN-MNT
 source:             DN42
diff --git a/data/organisation/ORG-RMNTN b/data/organisation/ORG-RMNTN
new file mode 100644
index 000000000..c549ea5a3
--- /dev/null
+++ b/data/organisation/ORG-RMNTN
@@ -0,0 +1,8 @@
+organisation:       ORG-RMNTN
+org-name:           Remonton Network
+descr:              Powered by Lemon Network Solutions
+www:                rmntn.net
+admin-c:            RACOMAIZER-DN42
+tech-c:             RACOMAIZER-DN42
+mnt-by:             RMNTN-MNT
+source:             DN42
diff --git a/data/person/AOTOKI-DN42 b/data/person/AOTOKI-DN42
new file mode 100644
index 000000000..67d7f2c24
--- /dev/null
+++ b/data/person/AOTOKI-DN42
@@ -0,0 +1,5 @@
+person:             Aotokitsuruya
+contact:            contact@frost.tw
+nic-hdl:            AOTOKI-DN42
+mnt-by:             AOTOKI-MNT
+source:             DN42
diff --git a/data/person/ASTRO-DN42 b/data/person/ASTRO-DN42
index 14c0b1413..bb218f2e7 100644
--- a/data/person/ASTRO-DN42
+++ b/data/person/ASTRO-DN42
@@ -3,5 +3,5 @@ contact:            mailto:astro@spaceboyz.net
 contact:            xmpp:astro@spaceboyz.net
 www:                http://spaceboyz.net/~astro/
 nic-hdl:            ASTRO-DN42
-mnt-by:             DUMMY-MNT
+mnt-by:             ASTRO-MNT
 source:             DN42
diff --git a/data/person/BAUEN1-DN42 b/data/person/BAUEN1-DN42
new file mode 100644
index 000000000..9368c3c97
--- /dev/null
+++ b/data/person/BAUEN1-DN42
@@ -0,0 +1,6 @@
+person:             bauen1
+contact:            mail:j2468h@gmail.com, irc:bauen1@hackint
+pgp-fingerprint:    5ED6D826ACD43F8ED9D4FBB2FF0AAF5E0812BA9C
+nic-hdl:            BAUEN1-DN42
+mnt-by:             BAUEN1-MNT
+source:             DN42
diff --git a/data/person/DANNYAAM-DN42 b/data/person/DANNYAAM-DN42
index 5bc4f265a..2a60facd6 100644
--- a/data/person/DANNYAAM-DN42
+++ b/data/person/DANNYAAM-DN42
@@ -1,5 +1,5 @@
 person:             DannyAAM
 contact:            danny@saru.moe
 nic-hdl:            DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 source:             DN42
diff --git a/data/person/DOZENCLOUD-DN42 b/data/person/DOZENCLOUD-DN42
new file mode 100644
index 000000000..40e3c5f59
--- /dev/null
+++ b/data/person/DOZENCLOUD-DN42
@@ -0,0 +1,5 @@
+person:             Date Huang
+contact:            tjjh89017@hotmail.com
+nic-hdl:            DOZENCLOUD-DN42
+mnt-by:             DOZENCLOUD-MNT
+source:             DN42
diff --git a/data/person/MIC92-DN42 b/data/person/MIC92-DN42
deleted file mode 100644
index b6b1ef028..000000000
--- a/data/person/MIC92-DN42
+++ /dev/null
@@ -1,9 +0,0 @@
-person:             Mic92
-e-mail:             joerg@higgsboson.tk
-contact:            xmpp:joerg@higgsboson.tk
-e-mail:             joerg@higgsboson.tk
-contact:            irc:Mic92
-pgp-fingerprint:    4ABA07382AD57E6B9AA4E88DCA4106B8D7CC79FA
-nic-hdl:            MIC92-DN42
-mnt-by:             MIC92-MNT
-source:             DN42
diff --git a/data/person/RACOMAIZER-DN42 b/data/person/RACOMAIZER-DN42
new file mode 100644
index 000000000..69610366f
--- /dev/null
+++ b/data/person/RACOMAIZER-DN42
@@ -0,0 +1,6 @@
+person:             Racomaizer
+contact:            dop@rmntn.net
+pgp-fingerprint:    ECE8C3CEB6D9D8B40744F5ED5FE94D68FA83B5BA
+nic-hdl:            RACOMAIZER-DN42
+mnt-by:             RMNTN-MNT
+source:             DN42
diff --git a/data/person/WHMCR-DN42 b/data/person/WHMCR-DN42
new file mode 100644
index 000000000..61027c5d1
--- /dev/null
+++ b/data/person/WHMCR-DN42
@@ -0,0 +1,5 @@
+person:             Welby McRoberts
+contact:            dn42@whmcr.com
+nic-hdl:            WHMCR-DN42
+mnt-by:             WHMCR-MNT
+source:             DN42
diff --git a/data/registry/DN42 b/data/registry/DN42
index b3a598818..d328cf53f 100644
--- a/data/registry/DN42
+++ b/data/registry/DN42
@@ -7,7 +7,6 @@ url:                mtn://mtn.dn42.eu
 url:                mtn://mtn.grmml.dn42
 url:                mtn://mtn.mhm.dn42
 url:                mtn://mtn.lossy.network
-url:                mtn://mtn.evenet.dn42
 url:                mtn://mtn.weiti.dn42
 mnt-by:             DN42-MNT
 source:             DN42
diff --git a/data/role/ORG-NETRAVNEN-DN42 b/data/role/ORG-NETRAVNEN-DN42
new file mode 100644
index 000000000..54d507be1
--- /dev/null
+++ b/data/role/ORG-NETRAVNEN-DN42
@@ -0,0 +1,7 @@
+role:               Yet Another Network Engineer
+nic-hdl:            ORG-NETRAVNEN-DN42
+abuse-mailbox:      abuse@netravnen.org
+admin-c:            NETRAVNEN-DN42
+tech-c:             NETRAVNEN-DN42
+mnt-by:             NETRAVNEN-MNT
+source:             DN42
diff --git a/data/route/172.20.160.64_26 b/data/route/172.20.160.64_26
new file mode 100644
index 000000000..448adf2ce
--- /dev/null
+++ b/data/route/172.20.160.64_26
@@ -0,0 +1,4 @@
+route:              172.20.160.64/26
+origin:             AS4242420616
+mnt-by:             AOTOKI-MNT
+source:             DN42
diff --git a/data/route/172.20.18.224_28 b/data/route/172.20.18.224_28
new file mode 100644
index 000000000..0ff89e562
--- /dev/null
+++ b/data/route/172.20.18.224_28
@@ -0,0 +1,4 @@
+route:              172.20.18.224/28
+origin:             AS4242420151
+mnt-by:             BAUEN1-MNT
+source:             DN42
diff --git a/data/route/172.20.239.192_27 b/data/route/172.20.239.192_27
index 5de5c90c6..94f3ea660 100644
--- a/data/route/172.20.239.192_27
+++ b/data/route/172.20.239.192_27
@@ -2,5 +2,5 @@ route:              172.20.239.192/27
 origin:             AS4242422439
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 source:             DN42
diff --git a/data/route/172.20.47.128_28 b/data/route/172.20.47.128_28
new file mode 100644
index 000000000..1f2de774f
--- /dev/null
+++ b/data/route/172.20.47.128_28
@@ -0,0 +1,4 @@
+route:              172.20.47.128/28
+origin:             AS4242420210
+mnt-by:             WHMCR-MNT
+source:             DN42
diff --git a/data/route/172.21.79.64_28 b/data/route/172.21.79.64_28
new file mode 100644
index 000000000..b02e14c0f
--- /dev/null
+++ b/data/route/172.21.79.64_28
@@ -0,0 +1,4 @@
+route:              172.21.79.64/28
+origin:             AS4242421873
+mnt-by:             RMNTN-MNT
+source:             DN42
diff --git a/data/route/172.22.100.0_24 b/data/route/172.22.100.0_24
index 4e6fdb810..25a78a83b 100644
--- a/data/route/172.22.100.0_24
+++ b/data/route/172.22.100.0_24
@@ -1,4 +1,9 @@
 route:              172.22.100.0/24
 origin:             AS64698
-mnt-by:             MIC92-MNT
+admin-c:            ASTRO-DN42
+admin-c:            ERI-DN42
+tech-c:             ASTRO-DN42
+tech-c:             ERI-DN42
+mnt-by:             ASTRO-MNT
+mnt-by:             ERI-MNT
 source:             DN42
diff --git a/data/route/172.22.181.0_25 b/data/route/172.22.181.0_25
new file mode 100644
index 000000000..435520e2c
--- /dev/null
+++ b/data/route/172.22.181.0_25
@@ -0,0 +1,4 @@
+route:              172.22.181.0/25
+origin:             AS4242421873
+mnt-by:             RMNTN-MNT
+source:             DN42
diff --git a/data/route/172.23.0.80_32 b/data/route/172.23.0.80_32
index f38ca2447..4fcb6742f 100644
--- a/data/route/172.23.0.80_32
+++ b/data/route/172.23.0.80_32
@@ -2,10 +2,8 @@ route:              172.23.0.80/32
 descr:              dn42 wiki anycast
 origin:             AS4242420123
 origin:             AS64737
-origin:             AS4242420092
 origin:             AS64719
 mnt-by:             GRMML-MNT
-mnt-by:             MIC92-MNT
 mnt-by:             NIXNODES-MNT
 mnt-by:             XUU-MNT
 mnt-by:             LUTOMA-MNT
diff --git a/data/route/172.23.173.0_27 b/data/route/172.23.173.0_27
new file mode 100644
index 000000000..bb7b89232
--- /dev/null
+++ b/data/route/172.23.173.0_27
@@ -0,0 +1,4 @@
+route:              172.23.173.0/27
+origin:             AS4242421178
+mnt-by:             DOZENCLOUD-MNT
+source:             DN42
diff --git a/data/route/172.23.75.0_24 b/data/route/172.23.75.0_24
deleted file mode 100644
index 18cbb28db..000000000
--- a/data/route/172.23.75.0_24
+++ /dev/null
@@ -1,4 +0,0 @@
-route:              172.23.75.0/24
-origin:             AS4242420092
-mnt-by:             MIC92-MNT
-source:             DN42
diff --git a/data/route/172.31.0.91_32 b/data/route/172.31.0.91_32
new file mode 100644
index 000000000..c8dc3d361
--- /dev/null
+++ b/data/route/172.31.0.91_32
@@ -0,0 +1,8 @@
+route:              172.31.0.91/32
+origin:             AS64654
+origin:             AS4242422718
+origin:             AS4242422480
+pingable:           172.31.0.91
+remarks:            Imported from chaosvpn, do not edit!
+mnt-by:             DN42-MNT
+source:             CHAOSVPN
diff --git a/data/route/172.31.86.0_24 b/data/route/172.31.86.0_24
new file mode 100644
index 000000000..7d419cbeb
--- /dev/null
+++ b/data/route/172.31.86.0_24
@@ -0,0 +1,7 @@
+route:              172.31.86.0/24
+origin:             AS64654
+origin:             AS4242422718
+origin:             AS4242422480
+remarks:            Imported from chaosvpn, do not edit!
+mnt-by:             DN42-MNT
+source:             CHAOSVPN
diff --git a/data/route6/fd23:42:c3d2::_56 b/data/route6/fd23:42:c3d2::_56
new file mode 100644
index 000000000..d5d790920
--- /dev/null
+++ b/data/route6/fd23:42:c3d2::_56
@@ -0,0 +1,9 @@
+route6:             fd23:42:c3d2::/56
+origin:             AS64698
+admin-c:            ASTRO-DN42
+admin-c:            ERI-DN42
+tech-c:             ASTRO-DN42
+tech-c:             ERI-DN42
+mnt-by:             ASTRO-MNT
+mnt-by:             ERI-MNT
+source:             DN42
diff --git a/data/route6/fd39:1c:2c1b::_48 b/data/route6/fd39:1c:2c1b::_48
index 2833b59c1..cfc26c02e 100644
--- a/data/route6/fd39:1c:2c1b::_48
+++ b/data/route6/fd39:1c:2c1b::_48
@@ -2,5 +2,5 @@ route6:             fd39:1c:2c1b::/48
 origin:             AS4242422439
 admin-c:            DANNYAAM-DN42
 tech-c:             DANNYAAM-DN42
-mnt-by:             SARU-MOE-MNT
+mnt-by:             SARU-MNT
 source:             DN42
diff --git a/data/route6/fd42:0568:127c::_48 b/data/route6/fd42:0568:127c::_48
new file mode 100644
index 000000000..a4bfdfaca
--- /dev/null
+++ b/data/route6/fd42:0568:127c::_48
@@ -0,0 +1,4 @@
+route6:             fd42:0568:127c::/48
+origin:             AS4242420616
+mnt-by:             AOTOKI-MNT
+source:             DN42
diff --git a/data/route6/fd42:4992:6a6d::_48 b/data/route6/fd42:4992:6a6d::_48
deleted file mode 100644
index 7c36eea9e..000000000
--- a/data/route6/fd42:4992:6a6d::_48
+++ /dev/null
@@ -1,4 +0,0 @@
-route6:             fd42:4992:6a6d::/48
-origin:             AS4242420092
-mnt-by:             MIC92-MNT
-source:             DN42
diff --git a/data/route6/fd42:68c2:8747::_48 b/data/route6/fd42:68c2:8747::_48
new file mode 100644
index 000000000..2a84cb30b
--- /dev/null
+++ b/data/route6/fd42:68c2:8747::_48
@@ -0,0 +1,4 @@
+route6:             fd42:68c2:8747::/48
+origin:             AS4242421178
+mnt-by:             DOZENCLOUD-MNT
+source:             DN42
diff --git a/data/route6/fd42:d42:d42:80::_64 b/data/route6/fd42:d42:d42:80::_64
index 066f9db93..b26dccbcc 100644
--- a/data/route6/fd42:d42:d42:80::_64
+++ b/data/route6/fd42:d42:d42:80::_64
@@ -3,9 +3,7 @@ descr:              Distributed Wiki
 origin:             AS64737
 origin:             AS4242420123
 origin:             AS64719
-origin:             AS4242420092
 mnt-by:             XUU-MNT
-mnt-by:             MIC92-MNT
 mnt-by:             GRMML-MNT
 mnt-by:             LUTOMA-MNT
 mnt-by:             NIXNODES-MNT
diff --git a/data/route6/fd42:f7b1:1078::_48 b/data/route6/fd42:f7b1:1078::_48
new file mode 100644
index 000000000..056d9ea65
--- /dev/null
+++ b/data/route6/fd42:f7b1:1078::_48
@@ -0,0 +1,4 @@
+route6:             fd42:f7b1:1078::/48
+origin:             AS4242420210
+mnt-by:             WHMCR-MNT
+source:             DN42
diff --git a/data/route6/fdbb:baba:2468::_48 b/data/route6/fdbb:baba:2468::_48
new file mode 100644
index 000000000..10df83b2b
--- /dev/null
+++ b/data/route6/fdbb:baba:2468::_48
@@ -0,0 +1,4 @@
+route6:             fdbb:baba:2468::/48
+origin:             AS4242420151
+mnt-by:             BAUEN1-MNT
+source:             DN42
diff --git a/data/route6/fdfd:d0b7:5feb::_48 b/data/route6/fdfd:d0b7:5feb::_48
new file mode 100644
index 000000000..28ef57295
--- /dev/null
+++ b/data/route6/fdfd:d0b7:5feb::_48
@@ -0,0 +1,4 @@
+route6:             fdfd:d0b7:5feb::/48
+origin:             AS4242421873
+mnt-by:             RMNTN-MNT
+source:             DN42