diff --git a/jerry-core/CMakeLists.txt b/jerry-core/CMakeLists.txt
index 043cabef4..498f62e83 100644
--- a/jerry-core/CMakeLists.txt
+++ b/jerry-core/CMakeLists.txt
@@ -177,10 +177,10 @@ endif()
 # Enable debugger
 if(FEATURE_DEBUGGER)
   set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_DEBUGGER)
-endif()
 
-# Debugger port
-set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_DEBUGGER_PORT=${FEATURE_DEBUGGER_PORT})
+  # Debugger port
+  set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_DEBUGGER_PORT=${FEATURE_DEBUGGER_PORT})
+endif()
 
 # Memory management stress-test mode
 if(FEATURE_MEM_STRESS_TEST)
diff --git a/jerry-debugger/jerry-client-ws.html b/jerry-debugger/jerry-client-ws.html
index 86b3aed84..6d2899e76 100644
--- a/jerry-debugger/jerry-client-ws.html
+++ b/jerry-debugger/jerry-client-ws.html
@@ -1070,7 +1070,7 @@ function debuggerCommand(event)
               "  list - list breakpoints\n" +
               "  continue|c - continue execution\n" +
               "  step|s - step-in execution\n" +
-              "  next|n - connect to server\n" +
+              "  next|n - execution until the next breakpoint\n" +
               "  eval|e - evaluate expression\n" +
               "  backtrace|bt <max-depth> - get backtrace\n" +
               "  src - print current source code\n" +