diff --git a/CHANGES b/CHANGES
index e5c524acb6..6114f54850 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5568.	[bug]		Fixed a crash in "dnssec-keyfromlabel" when using ECDSA
+			keys. [GL #2178]
+
 5567.	[bug]		Dig now reports unknown dash options while pre-parsing
 			the options.  This prevents '-multi' instead of
 			'+multi' reporting memory usage before ending option
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 9044417d92..80f956291f 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -77,3 +77,6 @@ Bug Fixes
 
 - KASP incorrectly set signature validity to the value of the DNSKEY signature
   validity. This is now fixed. [GL #2383]
+
+- Previously, ``dnssec-keyfromlabel`` crashed when operating on an ECDSA key.
+  This has been fixed. [GL #2178]