diff --git a/data/mntner/FFDA-MNT b/data/mntner/FFDA-MNT
new file mode 100644
index 000000000..7f7866173
--- /dev/null
+++ b/data/mntner/FFDA-MNT
@@ -0,0 +1,12 @@
+mntner:             FFDA-MNT
+descr:              Freifunk Darmstadt
+mnt-by:             FFDA-MNT
+admin-c:            TOMH-DN42
+tech-c:             TOMH-DN42
+auth:               pgp-fingerprint 5391FF19188A8718AEB45C75841A5B0DCEDA6192
+auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKYkU9Fla4gbEqj0nW2vSHQ8aVQM7RtB7E2ynAMU/rb7
+admin-c:            HEXA-DN42
+tech-c:             HEXA-DN42
+auth:               pgp-fingerprint F7D67CFBF2CA32F1641A03DB0D9F700847860BC5
+auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWhnfqUWBHlYhV7GpW9XkZVcbTnGIYq2Jupga2fP4pY
+source:             DN42
diff --git a/data/organisation/ORG-FFDA b/data/organisation/ORG-FFDA
index 3c9e839a7..b7f63a27f 100644
--- a/data/organisation/ORG-FFDA
+++ b/data/organisation/ORG-FFDA
@@ -1,7 +1,7 @@
 organisation:       ORG-FFDA
 org-name:           Freifunk Darmstadt
 www:                https://darmstadt.freifunk.net
-admin-c:            HEXA-DN42
-tech-c:             HEXA-DN42
-mnt-by:             HEXA-MNT
+admin-c:            FFDA-DN42
+tech-c:             FFDA-DN42
+mnt-by:             FFDA-MNT
 source:             DN42
diff --git a/data/person/FFDA-DN42 b/data/person/FFDA-DN42
deleted file mode 100644
index 7b8f8bbf7..000000000
--- a/data/person/FFDA-DN42
+++ /dev/null
@@ -1,7 +0,0 @@
-person:             FREIFUNK-DARMSTADT
-contact:            info@darmstadt.freifunk.net
-pgp-fingerprint:    90CFECED0F02B07AE7DA9B6A2D9077CAA85D3804
-org:                ORG-FFDA
-nic-hdl:            FFDA-DN42
-mnt-by:             HEXA-MNT
-source:             DN42
diff --git a/data/role/FFDA-DN42 b/data/role/FFDA-DN42
new file mode 100644
index 000000000..2ef74cf4c
--- /dev/null
+++ b/data/role/FFDA-DN42
@@ -0,0 +1,9 @@
+role:               Freifunk Darmstadt Operators
+nic-hdl:            FFDA-DN42
+remarks:            e-mail: icvpn@darmstadt.freifunk.net
+admin-c:            HEXA-DN42
+admin-c:            TOMH-DN42
+tech-c:             HEXA-DN42
+tech-c:             TOMH-DN42
+mnt-by:             FFDA-MNT
+source:             DN42