diff --git a/include/common/version.h b/include/common/version.h
index 248c22e23..fd5c95440 100644
--- a/include/common/version.h
+++ b/include/common/version.h
@@ -36,6 +36,12 @@
 #define PRODUCT_BRANCH   "2.1"
 #endif
 
+#ifdef  CONFIG_PRODUCT_STATUS
+#define PRODUCT_STATUS    CONFIG_PRODUCT_STATUS
+#else
+#define PRODUCT_STATUS   "Status: development branch - not safe for use in production."
+#endif
+
 #ifdef  CONFIG_PRODUCT_URL
 #define PRODUCT_URL    CONFIG_PRODUCT_URL
 #else
diff --git a/src/haproxy.c b/src/haproxy.c
index 699a1fea0..32d9d33ce 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -543,7 +543,8 @@ void hap_register_per_thread_free(int (*fct)())
 
 static void display_version()
 {
-	printf("HA-Proxy version %s %s - https://haproxy.org/\n", haproxy_version, haproxy_date);
+	printf("HA-Proxy version %s %s - https://haproxy.org/\n"
+	       PRODUCT_STATUS "\n", haproxy_version, haproxy_date);
 }
 
 static void display_build_opts()