diff --git a/doc/14-features.md b/doc/14-features.md
index 5e65cff00..4ccbebb83 100644
--- a/doc/14-features.md
+++ b/doc/14-features.md
@@ -738,7 +738,8 @@ A detailed list on the available table attributes can be found in the [Livestatu
## Status Data Files
> **Note**
-> This feature is deprecated and will be removed with Icinga 2.10.0
+>
+> This feature is DEPRECATED and will be removed in Icinga 2 v2.10.
Icinga 1.x writes object configuration data and status data in a cyclic
interval to its `objects.cache` and `status.dat` files. Icinga 2 provides
@@ -752,6 +753,10 @@ you can safely disable this feature.
## Compat Log Files
+> **Note**
+>
+> This feature is DEPRECATED and will be removed in Icinga 2 v2.10.
+
The Icinga 1.x log format is considered being the `Compat Log`
in Icinga 2 provided with the `CompatLogger` object.
diff --git a/lib/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp
index 29990a8ea..0b14c7edb 100644
--- a/lib/compat/compatlogger.cpp
+++ b/lib/compat/compatlogger.cpp
@@ -63,6 +63,9 @@ void CompatLogger::Start(bool runtimeCreated)
Log(LogInformation, "CompatLogger")
<< "'" << GetName() << "' started.";
+ Log(LogWarning, "CompatLogger")
+ << "The CompatLogger feature is DEPRECATED and will be removed in Icinga v2.10.";
+
Checkable::OnNewCheckResult.connect(std::bind(&CompatLogger::CheckResultHandler, this, _1, _2));
Checkable::OnNotificationSentToUser.connect(std::bind(&CompatLogger::NotificationSentHandler, this, _1, _2, _3, _4, _5, _6, _7, _8));
Downtime::OnDowntimeTriggered.connect(std::bind(&CompatLogger::TriggerDowntimeHandler, this, _1));
diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp
index c4289b366..fa9d8a50c 100644
--- a/lib/compat/statusdatawriter.cpp
+++ b/lib/compat/statusdatawriter.cpp
@@ -78,7 +78,7 @@ void StatusDataWriter::Start(bool runtimeCreated)
<< "'" << GetName() << "' started.";
Log(LogWarning, "StatusDataWriter")
- << "The StatusDataWriter feature is deprecated and will be removed with Icinga 2.10.0";
+ << "The StatusDataWriter feature is DEPRECATED and will be removed in Icinga v2.10.";
m_ObjectsCacheOutdated = true;