diff --git a/framework/doc/changelog.txt b/framework/doc/changelog.txt
index b0cfc66..f7639ed 100644
--- a/framework/doc/changelog.txt
+++ b/framework/doc/changelog.txt
@@ -5,6 +5,7 @@
     * [FELIX-4468] - EventObject is created with null pointer : "null source"
     * [FELIX-4960] - NPE in BundleRevisionImpl.getResourcesLocal()
     * [FELIX-4977] - Concurrency issue with factory services
+    * [FELIX-5010] - NPE when resolving bundle with a header "Bundle-NativeCode = *"
 
 ** Improvement
     * [FELIX-4938] - Throw an exception when service use count overflow
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index b0cfc66..f7639ed 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -5,6 +5,7 @@
     * [FELIX-4468] - EventObject is created with null pointer : "null source"
     * [FELIX-4960] - NPE in BundleRevisionImpl.getResourcesLocal()
     * [FELIX-4977] - Concurrency issue with factory services
+    * [FELIX-5010] - NPE when resolving bundle with a header "Bundle-NativeCode = *"
 
 ** Improvement
     * [FELIX-4938] - Throw an exception when service use count overflow