diff --git a/src/app.cpp b/src/app.cpp
index 8cbe775d..ddbc2771 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -465,7 +465,43 @@ void app:: zeroIvValues(bool checkAvail, bool skipYieldDay) {
 
 //-----------------------------------------------------------------------------
 void app::resetSystem(void) {
-    snprintf(mVersion, 12, "%d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
+    snprintf(mVersion, sizeof(mVersion), "%d.%d.%d%s", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH,
+    "-"
+#ifdef ENABLE_PROMETHEUS_EP
+    "P"
+#endif
+
+#ifdef ENABLE_MQTT
+    "M"
+#endif
+
+#ifdef PLUGIN_DISPLAY
+    "D"
+#endif
+
+#ifdef ENABLE_HISTORY
+    "H"
+#endif
+
+#ifdef AP_ONLY
+    "A"
+#endif
+
+#ifdef ENABLE_SYSLOG
+    "Y"
+#endif
+
+#ifdef ENABLE_SIMULATOR
+    "S"
+#endif
+
+    "-"
+#ifdef LANG_DE
+    "de"
+#else
+    "en"
+#endif
+    );
 
 #ifdef AP_ONLY
     mTimestamp = 1;
diff --git a/src/app.h b/src/app.h
index 194f291e..0015ede4 100644
--- a/src/app.h
+++ b/src/app.h
@@ -386,7 +386,7 @@ class app : public IApp, public ah::Scheduler {
         CmtRadio<> mCmtRadio;
         #endif
 
-        char mVersion[12];
+        char mVersion[23];
         settings mSettings;
         settings_t *mConfig;
         bool mSavePending;