diff --git a/CHANGELOG b/CHANGELOG
index 2d2a60f066..7ff0216312 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 devel
 -----
 
+* added greeting warning about maintainer mode
+
 * improve insertion time into non-unique secondary indexes with the RocksDB
   engine
 
diff --git a/lib/ApplicationFeatures/GreetingsFeature.cpp b/lib/ApplicationFeatures/GreetingsFeature.cpp
index 4f292d4355..b131fb85ba 100644
--- a/lib/ApplicationFeatures/GreetingsFeature.cpp
+++ b/lib/ApplicationFeatures/GreetingsFeature.cpp
@@ -35,6 +35,17 @@ GreetingsFeature::GreetingsFeature(application_features::ApplicationServer& serv
 void GreetingsFeature::prepare() {
   LOG_TOPIC(INFO, arangodb::Logger::FIXME)
       << "" << rest::Version::getVerboseVersionString();
+
+#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
+  LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+    << "==========================================================";
+  LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+    << "== This is a maintainer version intended for debugging. ==";
+  LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+    << "==           DO NOT USE IN PRODUCTION!                  ==";
+  LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+    << "==========================================================";
+#endif
 }
 
 void GreetingsFeature::unprepare() {