diff --git a/libctf/ChangeLog b/libctf/ChangeLog
index d91abd278a..dd3113b316 100644
--- a/libctf/ChangeLog
+++ b/libctf/ChangeLog
@@ -1,3 +1,7 @@
+2019-06-28  Nick Alcock <nick.alcock@oracle.com>
+
+	* ctf-hash.c (ctf_dynhash_remove): Call with a mocked-up element.
+
 2019-06-28  Nick Alcock <nick.alcock@oracle.com>
 
 	* ctf-dump.c (ctf_dump_format_type): Prefix hex strings with 0x.
diff --git a/libctf/ctf-hash.c b/libctf/ctf-hash.c
index adfe93e5c0..03a398e06c 100644
--- a/libctf/ctf-hash.c
+++ b/libctf/ctf-hash.c
@@ -176,7 +176,8 @@ ctf_dynhash_insert (ctf_dynhash_t *hp, void *key, void *value)
 void
 ctf_dynhash_remove (ctf_dynhash_t *hp, const void *key)
 {
-  htab_remove_elt (hp->htab, (void *) key);
+  ctf_helem_t hep = { (void *) key, NULL, NULL, NULL };
+  htab_remove_elt (hp->htab, &hep);
 }
 
 void *