diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ae121901..34f306cb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - frontpage: Show app logos instead of generic icons.
 - Prevent anonymous users from accessing setup pages.
+- Firstboot, KVStore: merge old firstboot state fields.
 
 ## [0.12.0] - 2016-12-08
 ### Added
diff --git a/plinth/modules/first_boot/__init__.py b/plinth/modules/first_boot/__init__.py
index 76b7c419e..c9648c008 100644
--- a/plinth/modules/first_boot/__init__.py
+++ b/plinth/modules/first_boot/__init__.py
@@ -35,6 +35,7 @@ first_boot_steps = [
         'order': 0
     },
     {
+        # TODO: Rename this, or merge with 'firstboot_completed'.
         'id': 'firstboot_complete',
         'url': 'first_boot:complete',
         'order': 10