diff --git a/data/aut-num/AS4242421078 b/data/aut-num/AS4242421078
index 67ab6daf1..5ce67b38c 100644
--- a/data/aut-num/AS4242421078
+++ b/data/aut-num/AS4242421078
@@ -1,6 +1,7 @@
 aut-num:            AS4242421078
-as-name:            AS-PGNHD-DN42
-admin-c:            PGNHD-DN42
-tech-c:             PGNHD-DN42
-mnt-by:             PGNHD-MNT
+as-name:            AS-RISEUPGROUP-DN42
+admin-c:            RISEUPGROUP-DN42
+tech-c:             RISEUPGROUP-DN42
+mnt-by:             RISEUPGROUP-MNT
 source:             DN42
+org:                ORG-RISEUPGROUP
diff --git a/data/dns/comet.dn42 b/data/dns/comet.dn42
new file mode 100644
index 000000000..c926af384
--- /dev/null
+++ b/data/dns/comet.dn42
@@ -0,0 +1,7 @@
+domain:             comet.dn42
+admin-c:            RISEUPGROUP-DN42
+tech-c:             RISEUPGROUP-DN42
+mnt-by:             RISEUPGROUP-MNT
+nserver:            ns1.comet.dn42 172.23.86.34
+source:             DN42
+org:                ORG-RISEUPGROUP
diff --git a/data/dns/riseupgroup.dn42 b/data/dns/riseupgroup.dn42
new file mode 100644
index 000000000..74a48d378
--- /dev/null
+++ b/data/dns/riseupgroup.dn42
@@ -0,0 +1,7 @@
+domain:             riseupgroup.dn42
+admin-c:            RISEUPGROUP-DN42
+tech-c:             RISEUPGROUP-DN42
+mnt-by:             RISEUPGROUP-MNT
+nserver:            ns1.riseupgroup.dn42 172.23.86.34
+source:             DN42
+org:                ORG-RISEUPGROUP
diff --git a/data/inet6num/fdb4:2dc1:c741::_48 b/data/inet6num/fdb4:2dc1:c741::_48
index 4e4fca833..02a277270 100644
--- a/data/inet6num/fdb4:2dc1:c741::_48
+++ b/data/inet6num/fdb4:2dc1:c741::_48
@@ -1,9 +1,10 @@
 inet6num:           fdb4:2dc1:c741:0000:0000:0000:0000:0000 - fdb4:2dc1:c741:ffff:ffff:ffff:ffff:ffff
-netname:            PGNHD-IP6NET
+netname:            RISEUPGROUP-IP6NET
 cidr:               fdb4:2dc1:c741::/48
-admin-c:            PGNHD-DN42
-tech-c:             PGNHD-DN42
-mnt-by:             PGNHD-MNT
-nserver:            ns1.pgnhd.dn42
+admin-c:            RISEUPGROUP-DN42
+tech-c:             RISEUPGROUP-DN42
+mnt-by:             RISEUPGROUP-MNT
+nserver:            ns1.riseupgroup.dn42
 status:             ASSIGNED
 source:             DN42
+org:                ORG-RISEUPGROUP
diff --git a/data/inetnum/172.23.86.32_27 b/data/inetnum/172.23.86.32_27
index df4e7ca2f..319eb82a2 100644
--- a/data/inetnum/172.23.86.32_27
+++ b/data/inetnum/172.23.86.32_27
@@ -1,9 +1,10 @@
 inetnum:            172.23.86.32 - 172.23.86.63
 cidr:               172.23.86.32/27
-nserver:            ns1.pgnhd.dn42
-netname:            PGNHD-NET
-admin-c:            PGNHD-DN42
-tech-c:             PGNHD-DN42
-mnt-by:             PGNHD-MNT
+nserver:            ns1.riseupgroup.dn42
+netname:            RISEUPGROUP-NET
+admin-c:            RISEUPGROUP-DN42
+tech-c:             RISEUPGROUP-DN42
+mnt-by:             RISEUPGROUP-MNT
 status:             ASSIGNED
 source:             DN42
+org:                ORG-RISEUPGROUP
diff --git a/data/mntner/PGNHD-MNT b/data/mntner/PGNHD-MNT
index fcb5b7bf2..109855c86 100644
--- a/data/mntner/PGNHD-MNT
+++ b/data/mntner/PGNHD-MNT
@@ -2,6 +2,6 @@ mntner:             PGNHD-MNT
 admin-c:            PGNHD-DN42
 tech-c:             PGNHD-DN42
 mnt-by:             PGNHD-MNT
-auth:               pgp-fingerprint C97AA8EB225ACF10D9E5E6E748AEABFD85D94C53
+auth:               pgp-fingerprint 70B4FD2216AB59BD07E0E5DEBD627BFCDD481C7E
 auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA17mbQOxum5EAxPyifS5LRdUbqa+TUEQJUahtqfUyiozl+FpS82P5cf+kkJR61dog2YguDPOjE32LGsaNhK+eqvdnw2l1p4yj1q4f2sz9x+9p64Ujlp04lMBBfHfZa6hcAT4NvF7CCiS9k/aEVBzIw/AfEf1P+Xk0SpMH2T2cFHopYnanRK+9XS4fJKpUHENInqnqiVxZK9QqV0h1mKK0QpA12uSl4e+olHOE/201rpUfysoe4dg2h8C7AyoxxX8V0HqnFx2/dTrVmxtcFYwzap0+GO3p8skwv1HSznMdP4FtnNbgT5Y0PCOS3Ef0PeIpnJNStbVfWUJVKGusOJgn pgnhd@RGB
 source:             DN42
diff --git a/data/mntner/RISEUPGROUP-MNT b/data/mntner/RISEUPGROUP-MNT
new file mode 100644
index 000000000..3b342c691
--- /dev/null
+++ b/data/mntner/RISEUPGROUP-MNT
@@ -0,0 +1,8 @@
+mntner:             RISEUPGROUP-MNT
+admin-c:            RISEUPGROUP-DN42
+tech-c:             RISEUPGROUP-DN42
+mnt-by:             RISEUPGROUP-MNT
+auth:               pgp-fingerprint C2A0E0436B592267CEB29223D1122CF4F99AF885
+auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcFiXTVKfr1nmcLzsW9pyZ5Tq806fWFXq8kFFAP/NEF dn42@riseupgroup.net
+org:                ORG-RISEUPGROUP
+source:             DN42
diff --git a/data/organisation/ORG-RISEUPGROUP b/data/organisation/ORG-RISEUPGROUP
new file mode 100644
index 000000000..c3bb5d04b
--- /dev/null
+++ b/data/organisation/ORG-RISEUPGROUP
@@ -0,0 +1,8 @@
+organisation:       ORG-RISEUPGROUP
+org-name:           RiseUp-Group
+e-mail:             dn42@riseupgroup.net
+www:                http://riseupgroup.net
+admin-c:            RISEUPGROUP-DN42
+tech-c:             RISEUPGROUP-DN42
+mnt-by:             RISEUPGROUP-MNT
+source:             DN42
diff --git a/data/person/RISEUPGROUP-DN42 b/data/person/RISEUPGROUP-DN42
new file mode 100644
index 000000000..6660c8ed9
--- /dev/null
+++ b/data/person/RISEUPGROUP-DN42
@@ -0,0 +1,5 @@
+person:             RISEUPGROUP
+e-mail:             dn42@riseupgroup.net
+nic-hdl:            RISEUPGROUP-DN42
+mnt-by:             RISEUPGROUP-MNT
+source:             DN42
diff --git a/data/route/172.23.86.32_27 b/data/route/172.23.86.32_27
index 9a81f36b1..82df15078 100644
--- a/data/route/172.23.86.32_27
+++ b/data/route/172.23.86.32_27
@@ -1,4 +1,4 @@
 route:              172.23.86.32/27
 origin:             AS4242421078
-mnt-by:             PGNHD-MNT
+mnt-by:             RISEUPGROUP-MNT
 source:             DN42
diff --git a/data/route6/fdb4:2dc1:c741::_48 b/data/route6/fdb4:2dc1:c741::_48
index c767f5305..1483a03f8 100644
--- a/data/route6/fdb4:2dc1:c741::_48
+++ b/data/route6/fdb4:2dc1:c741::_48
@@ -1,5 +1,5 @@
 route6:             fdb4:2dc1:c741::/48
 origin:             AS4242421078
 max-length:         48
-mnt-by:             PGNHD-MNT
+mnt-by:             RISEUPGROUP-MNT
 source:             DN42