diff --git a/src/backend/filedescriptor.c b/src/backend/filedescriptor.c
index 6db2882c9..51b536e56 100644
--- a/src/backend/filedescriptor.c
+++ b/src/backend/filedescriptor.c
@@ -214,6 +214,9 @@ lumiera_filedescriptor_new (LumieraFiledescriptor template)
   lumiera_mutex_init (&self->lock);
   self->reopened = 0;
   self->refcount = 1;
+  self->handle = 0;
+
+  RESOURCE_ANNOUNCE (filedescriptor, "mutex", "filedescriptor", self, self->rh);
 
   return self;
 }
@@ -231,10 +234,15 @@ lumiera_filedescriptor_delete (LumieraFiledescriptor self)
 
   REQUIRE (self->refcount == 0);
 
+  RESOURCE_FORGET (filedescriptor, self->rh);
+
   cuckoo_remove (registry, cuckoo_find (registry, &self));
 
   TODO ("destruct other members (WIP)");
 
+
+  TODO ("release filehandle");
+
   lumiera_mutex_destroy (&self->lock);
   free (self);
 
diff --git a/src/backend/filedescriptor.h b/src/backend/filedescriptor.h
index 59c4eacef..48d0cd21c 100644
--- a/src/backend/filedescriptor.h
+++ b/src/backend/filedescriptor.h
@@ -45,8 +45,11 @@ struct lumiera_filedescriptor_struct
   unsigned reopened;                    /* count for reopens 0=not yet opened, 1=first, 2..=reopened */
   unsigned refcount;                    /* reference counter, all users sans registry */
 
+  LumieraFilehandle handle;
   //LumieraFileMap mappings;
   //LumieraWriteBuffer writebuffer;
+
+  RESOURCE_HANDLE (rh);
 };