diff --git a/src/switch_console.c b/src/switch_console.c
index 58d364e9ae..e3cafa9ada 100644
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -432,6 +432,7 @@ char *prompt(EditLine * e)
 {
 	if (*prompt_str == '\0') {
 		gethostname(hostname, sizeof(hostname));
+		switch_core_set_variable("hostname", hostname);
 		switch_snprintf(prompt_str, sizeof(prompt_str), "freeswitch@%s> ", hostname);
 	}