diff --git a/data/dns/noteblok.dn42 b/data/dns/noteblok.dn42
deleted file mode 100644
index 4e0461691..000000000
--- a/data/dns/noteblok.dn42
+++ /dev/null
@@ -1,9 +0,0 @@
-domain:             noteblok.dn42
-descr:              my personal web blog
-admin-c:            STV0G-DN42
-tech-c:             STV0G-DN42
-mnt-by:             NULLL-MNT
-nserver:            ns1.0l.dn42
-nserver:            ns2.0l.dn42
-status:             EVALPEND 1503917763
-source:             DN42
diff --git a/data/inetnum/172.23.157.0_24 b/data/inetnum/172.23.157.0_24
new file mode 100644
index 000000000..47d77d2f5
--- /dev/null
+++ b/data/inetnum/172.23.157.0_24
@@ -0,0 +1,11 @@
+inetnum:            172.23.157.0 - 172.23.157.255
+netname:            NET-NULLL-HOME
+descr:              My home network
+country:            DE
+admin-c:            STV0G-DN42
+tech-c:             STV0G-DN42
+mnt-by:             NULLL-MNT
+status:             ASSIGNED
+nserver:            ns0.0l.dn42
+cidr:               172.23.157.0/24
+source:             DN42
diff --git a/data/mntner/NULLL-MNT b/data/mntner/NULLL-MNT
index 4a6f064f1..87e47362c 100644
--- a/data/mntner/NULLL-MNT
+++ b/data/mntner/NULLL-MNT
@@ -5,3 +5,5 @@ admin-c:            STV0G-DN42
 tech-c:             STV0G-DN42
 mnt-by:             NULLL-MNT
 source:             DN42
+auth:               pgp-fingerprint 09BE3BAE8D55D4CD8579285A9675EAC34897E6E2
+auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC9kuBu/eYcN1hNNIWEVfswO/rOoE1JVQPK+92Y6r856xrdaCpGOtHv5MBmO70fmGEFZ86e2QC0Ij5zqlwqTTNwWAHxT6H9d3CytThx54UronOCeQxQBYcJpLDSdY5MuseZjm0RlW+7aSNvnUttDByGBoCl+VWaaNF+dN2MWzrGIw0rvKJ24OVhPmm91VwOIoCJkKJ9AL1OEIpCH7n7jcaJYVBP2j+RVYfq47W4e9SfE/QlL+QVk360w+kFSeTybaMnsWALZNwk/kywzPq1dpw+4ToD6qBF6leY7ivD/ZsFppbndyzjW93PO3IWlTXmFd/UK/3xzihuZE9KWl0D1O5hny3o0DXkWK96xSFA4hhMqkVw0bNS9+jVq3fuaGNAtOUEg0rfCPPf0fwnPYq9pOyDUViGHDhMY/yWBSqlN+L3Rt9b8hwh0bhsAQiWF5ujIo3mivFD6BQQAyK52Qz778VRPK39k0gpYxqltcJEfjJ832arvNO9XseUKUQAi50gVyXfxD3yQK++0U1E9isF+VyLd1m5MgrtPlP20Ab2PJD6UUaMpr1rEldP9jVsGpVowntC/Hp4/ljCeppize4CRgZjWDHE+Yj+TWmVeuUTObniVWpE/eiQoDIe+FBWPeStq3UMPW5viUafzf2sCUxMyc/ZTUqy8wzDZEyfJ7OGaoxPrQ==
diff --git a/data/person/STV0G-DN42 b/data/person/STV0G-DN42
index 0f53fc55c..06f9bbc37 100644
--- a/data/person/STV0G-DN42
+++ b/data/person/STV0G-DN42
@@ -1,8 +1,9 @@
 person:             Steffen Vogel
 nic-hdl:            STV0G-DN42
 e-mail:             post@steffenvogel.de
+nick:               stv0g
 phone:              +4915757180927
-www:                http://www.steffenvogel.de
+www:                https://www.steffenvogel.de
 contact:            twitter:stv0g
 contact:            xmpp:steffen.vogel@jabber.rwth-aachen.de
 pgp-fingerprint:    DD607D6E6DE50F469FAF4D8259D531B8ED659472
diff --git a/data/tinc-key/NULLL-TINC b/data/tinc-key/NULLL-TINC
deleted file mode 100644
index c052e34b9..000000000
--- a/data/tinc-key/NULLL-TINC
+++ /dev/null
@@ -1,23 +0,0 @@
-tinc-key:           NULLL-TINC
-tinc-host:          nulll
-compression:        9
-descr:              /dev/nulll Tinc VPN node
-mnt-by:             NULLL-MNT
-admin-c:            STV0G-DN42
-subnet:             172.23.3.5/32
-tinc-address:       tux.0l.de
-port:               657
-tinc-file:          
-                    Subnet = 172.23.3.5/32
-                    Address = tux.0l.de
-                    Compression = 9
-                    Port = 657
-                    -----BEGIN RSA PUBLIC KEY-----
-                    MIIBCgKCAQEAvTon5K5GcXd8k3Z+yIOLkwNLByUo4aHp6P4X35TK5GgCIZY7Mi7x
-                    K6V9YmRWEcPylHQQTJcvjRATFc2jBcjn6rfdWK+hYDF68GXEt6jjAIVmADF/fwTy
-                    3f/F19uFxfgqCOqJIs9GZF2QePYRRoC+rBRpArD7CyJi0ZaxuH8d9oFc4lxvrL8X
-                    zjLbQ09udelC87eEvBL6kLb1420blMLz7M92Si/ErEr8GbSGqo34GUx4n14fv8bQ
-                    XEIftMFZXQzZaAyBYYlXFX5OIDsJKA0pGedJFn1pnc5nuyj6fXCHxAjBFqC6/Odb
-                    dAuG0GNchC0Y3JHQf0ktoDfWPUGqSR+EPQIDAQAB
-                    -----END RSA PUBLIC KEY-----
-source:             DN42
diff --git a/data/tinc-keyset/SET-AS76103IX-TINC b/data/tinc-keyset/SET-AS76103IX-TINC
index fd8294afe..10a4a8569 100644
--- a/data/tinc-keyset/SET-AS76103IX-TINC
+++ b/data/tinc-keyset/SET-AS76103IX-TINC
@@ -1,7 +1,6 @@
 tinc-keyset:        SET-AS76103IX-TINC
 member:             AS76103IX-TINC
 member:             AS76103US-TINC
-member:             NULLL-TINC
 member:             AS4242422703-TINC
 admin-c:            NIXNODES-DN42
 mnt-by:             NIXNODES-MNT