diff --git a/.gitignore b/.gitignore
index 356bab8..a6452df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@
 *~
 
 config.h
+*.log
+build.conf
diff --git a/src/Ntk-Console/Makefile b/src/Ntk-Console/Makefile
deleted file mode 100644
index d3434c7..0000000
--- a/src/Ntk-Console/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-C=clang
-DEBUG=-g -fno-builtin -Wfatal-errors -pedantic -Wunreachable-code -Winline -Wredundant-decls -Wno-vla
-CFLAGS=-Wall ${DEBUG} -std=c99
-SRCBIN=Netsukuku-Console
-
-all: ${SRCBIN}
-
-${SRCBIN}: Netsukuku-Console.o
-	${C} ${LDFLAGS} ${CFLAGS} ${LIBS} $^ -o $@
-
-.PHONY: clean
-
-clean:
-	rm -f *.o ${SRCBIN}
diff --git a/src/Ntk-Console/Ntk-Console-Compile.sh b/src/Ntk-Console/Ntk-Console-Compile.sh
deleted file mode 100644
index ae4d5d9..0000000
--- a/src/Ntk-Console/Ntk-Console-Compile.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-make clean
-make
\ No newline at end of file
diff --git a/src/SConscript b/src/SConscript
index 93e27a3..3021508 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -40,6 +40,7 @@ sources_ntkresolv = sources_common + Split("""andns_lib.c ntkresolv.c andns_net.
 					      crypto.c snsd_cache.c inet.c
 					      ll_map.c libnetlink.c
 					      err_errno.c""") 
+sources_ntkconsole = Split('ntk-console.c')
 
 libs = ['gmp', 'pthread', 'crypto', 'z']
 
@@ -153,8 +154,9 @@ build_config_files(env = env)
 ntkd 	= env.Program('ntkd', sources_netsukuku, LIBS = libs, CPPPATH = '.')
 qspn    = env.Program('qspn-empiric', sources_qspn, LIBS = libs, CPPPATH = '.')
 ntkresolv = env.Program('ntk-resolv', sources_ntkresolv, LIBS = libs, CPPPATH = '.')
+ntkconsole = env.Program('ntk-console', sources_ntkconsole, LIBS = libs, CPPPATH = '.', CFLAGS = '-std=c99')
 
-Default(ntkd, ntkresolv)
+Default(ntkd, ntkresolv, ntkconsole)
 
 
 #
@@ -171,6 +173,7 @@ idir_pid    = '$destdir' + '$PID_DIR'
 
 env.Install(idir_bin, [ntkd])
 env.Install(idir_bin, [ntkresolv])
+env.Install(idir_bin, [ntkconsole])
 env.Alias('install', [idir_bin, idir_conf])
 
 #Dirty hack ;( Why GetOption("install") doesn't work?
diff --git a/src/Ntk-Console/Netsukuku-Console.c b/src/ntk-console.c
similarity index 99%
rename from src/Ntk-Console/Netsukuku-Console.c
rename to src/ntk-console.c
index 9dd2b03..2fe1f8d 100644
--- a/src/Ntk-Console/Netsukuku-Console.c
+++ b/src/ntk-console.c
@@ -1,5 +1,5 @@
 
-#include "Netsukuku-Console.h"
+#include "ntk-console.h"
 
 #include <unistd.h>
 
diff --git a/src/Ntk-Console/Netsukuku-Console.h b/src/ntk-console.h
similarity index 100%
rename from src/Ntk-Console/Netsukuku-Console.h
rename to src/ntk-console.h