diff --git a/data/aut-num/AS4242420851 b/data/aut-num/AS4242420851
new file mode 100644
index 000000000..db5b158d3
--- /dev/null
+++ b/data/aut-num/AS4242420851
@@ -0,0 +1,9 @@
+aut-num:            AS4242420851
+as-name:            KLAB-AS
+descr:              KLab aka The Komputer Lab
+admin-c:            KYBERORG-DN42
+tech-c:             KYBERORG-DN42
+remarks:            Peer with us at dn42@klab.sh
+mnt-by:             KYBERORG-MNT
+mnt-by:             JUSSI-MNT
+source:             DN42
diff --git a/data/aut-num/AS216311 b/data/aut-num/AS4242421775
similarity index 62%
rename from data/aut-num/AS216311
rename to data/aut-num/AS4242421775
index 4998e2e24..0b61ca6d2 100644
--- a/data/aut-num/AS216311
+++ b/data/aut-num/AS4242421775
@@ -1,8 +1,8 @@
-aut-num:            AS216311
+aut-num:            AS4242421775
 as-name:            KYBERORG-AS
-descr:              Kyberorg Xperimental/Personal AS
+descr:              Kyberorg Personal AS
 admin-c:            KYBERORG-DN42
 tech-c:             KYBERORG-DN42
 remarks:            Peer with me at asm@kmail.ee
 mnt-by:             KYBERORG-MNT
-source:             RIPE
+source:             DN42
diff --git a/data/inet6num/fd42:2c:500::_48 b/data/inet6num/fd42:2c:500::_48
new file mode 100644
index 000000000..6770c62eb
--- /dev/null
+++ b/data/inet6num/fd42:2c:500::_48
@@ -0,0 +1,12 @@
+inet6num:           fd42:002c:0500:0000:0000:0000:0000:0000 - fd42:002c:0500:ffff:ffff:ffff:ffff:ffff
+cidr:               fd42:2c:500::/48
+netname:            KLAB-NETWORK
+descr:              KLab aka The Komputer Lab IPv6 Network Range
+remarks:            peer with us at dn42@klab.sh
+country:            EE
+admin-c:            KYBERORG-DN42
+tech-c:             KYBERORG-DN42
+mnt-by:             KYBERORG-MNT
+mnt-by:             JUSSI-MNT
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.23.231.0_28 b/data/inetnum/172.23.231.0_28
index 4f22e1598..f80508a7f 100644
--- a/data/inetnum/172.23.231.0_28
+++ b/data/inetnum/172.23.231.0_28
@@ -1,11 +1,12 @@
 inetnum:            172.23.231.0 - 172.23.231.15
 cidr:               172.23.231.0/28
-netname:            KYBERORG-NETWORK
-descr:              Aleksandr Muravja aka Kyberorg IPv4 Network Range
-remarks:            peer with us at asm@kmail.ee
+netname:            KLAB-NETWORK
+descr:              KLab aka The Komputer Lab IPv4 Network Range
+remarks:            peer with us at dn42@klab.sh
 country:            EE
 admin-c:            KYBERORG-DN42
 tech-c:             KYBERORG-DN42
 mnt-by:             KYBERORG-MNT
+mnt-by:             JUSSI-MNT
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.23.231.16_28 b/data/inetnum/172.23.231.16_28
new file mode 100644
index 000000000..43f832671
--- /dev/null
+++ b/data/inetnum/172.23.231.16_28
@@ -0,0 +1,11 @@
+inetnum:            172.23.231.16 - 172.23.231.31
+cidr:               172.23.231.16/28
+netname:            KYBERORG-NETWORK
+descr:              Aleksandr Muravja aka Kyberorg IPv4 Network Range
+remarks:            peer with me at asm@kmail.ee
+country:            EE
+admin-c:            KYBERORG-DN42
+tech-c:             KYBERORG-DN42
+mnt-by:             KYBERORG-MNT
+status:             ASSIGNED
+source:             DN42
diff --git a/data/route/172.23.231.0_28 b/data/route/172.23.231.0_28
index 780588020..17adab9ce 100644
--- a/data/route/172.23.231.0_28
+++ b/data/route/172.23.231.0_28
@@ -1,5 +1,6 @@
 route:              172.23.231.0/28
 max-length:         28
-origin:             AS216311
+origin:             AS4242420851
 mnt-by:             KYBERORG-MNT
+mnt-by:             JUSSI-MNT
 source:             DN42
diff --git a/data/route/172.23.231.16_28 b/data/route/172.23.231.16_28
new file mode 100644
index 000000000..3fe6aa042
--- /dev/null
+++ b/data/route/172.23.231.16_28
@@ -0,0 +1,5 @@
+route:              172.23.231.16/28
+max-length:         28
+origin:             AS4242421775
+mnt-by:             KYBERORG-MNT
+source:             DN42
diff --git a/data/route6/fd21:3087::_48 b/data/route6/fd21:3087::_48
index 4a031db46..f7b85a2c0 100644
--- a/data/route6/fd21:3087::_48
+++ b/data/route6/fd21:3087::_48
@@ -1,5 +1,5 @@
 route6:             fd21:3087::/48
 max-length:         48
-origin:             AS216311
+origin:             AS4242421775
 mnt-by:             KYBERORG-MNT
 source:             DN42
diff --git a/data/route6/fd42:2c:500::_48 b/data/route6/fd42:2c:500::_48
new file mode 100644
index 000000000..0ebec9d2b
--- /dev/null
+++ b/data/route6/fd42:2c:500::_48
@@ -0,0 +1,6 @@
+route6:             fd42:2c:500::/48
+max-length:         48
+origin:             AS4242420851
+mnt-by:             KYBERORG-MNT
+mnt-by:             JUSSI-MNT
+source:             DN42