diff --git a/jerry-core/jerry.c b/jerry-core/jerry.c
index 8b371bb2e..17d9b28db 100644
--- a/jerry-core/jerry.c
+++ b/jerry-core/jerry.c
@@ -618,6 +618,9 @@ bool jerry_is_feature_enabled (const jerry_feature_t feature)
 #ifdef JERRY_ENABLE_SNAPSHOT_EXEC
           || feature == JERRY_FEATURE_SNAPSHOT_EXEC
 #endif /* JERRY_ENABLE_SNAPSHOT_EXEC */
+#ifdef JERRY_DEBUGGER
+          || feature == JERRY_FEATURE_DEBUGGER
+#endif /* JERRY_DEBUGGER */
           );
 } /* jerry_is_feature_enabled */
 
diff --git a/jerry-core/jerryscript.h b/jerry-core/jerryscript.h
index 7e724080d..154505d43 100644
--- a/jerry-core/jerryscript.h
+++ b/jerry-core/jerryscript.h
@@ -85,6 +85,7 @@ typedef enum
   JERRY_FEATURE_REGEXP_DUMP, /**< regexp byte-code dumps */
   JERRY_FEATURE_SNAPSHOT_SAVE, /**< saving snapshot files */
   JERRY_FEATURE_SNAPSHOT_EXEC, /**< executing snapshot files */
+  JERRY_FEATURE_DEBUGGER, /**< debugging */
   JERRY_FEATURE__COUNT /**< number of features. NOTE: must be at the end of the list */
 } jerry_feature_t;
 
diff --git a/jerry-main/main-unix.c b/jerry-main/main-unix.c
index 144fd5deb..7910ab124 100644
--- a/jerry-main/main-unix.c
+++ b/jerry-main/main-unix.c
@@ -483,7 +483,16 @@ main (int argc,
     }
     else if (!strcmp ("--start-debug-server", argv[i]))
     {
-      flags |= JERRY_INIT_DEBUGGER;
+      if (jerry_is_feature_enabled (JERRY_FEATURE_DEBUGGER))
+      {
+        flags |= JERRY_INIT_DEBUGGER;
+      }
+      else
+      {
+        jerry_port_default_set_log_level (JERRY_LOG_LEVEL_WARNING);
+        jerry_port_log (JERRY_LOG_LEVEL_WARNING,
+                        "Ignoring 'start-debug-server' option because this feature is disabled!\n");
+      }
     }
     else if (!strcmp ("--save-snapshot-for-global", argv[i])
              || !strcmp ("--save-snapshot-for-eval", argv[i]))