diff --git a/Makefile.am b/Makefile.am
index 4418366..239360d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,11 +99,11 @@ dist_man1_MANS       = doc/tinmop.man
 
 $(PACKAGE): $(CONF_PATH_FILE) *.asd src/*
 	$(LISP_COMPILER) \
-		--dynamic-space-size $(DYNAMIC_MEMORY_SIZE) \
-		--eval "(require 'asdf)" \
-		--eval "(push \"$$(pwd)/\" asdf:*central-registry*)" \
-		--eval "(asdf:make '$(PACKAGE) :build-pathname \"../$(PACKAGE)\")" \
-		--eval "(uiop:quit)"
+	--dynamic-space-size $(DYNAMIC_MEMORY_SIZE) \
+	--eval "(require 'asdf)" \
+	--eval "(push \"$$(pwd)/\" asdf:*central-registry*)" \
+	--eval "(asdf:make '$(PACKAGE) :build-pathname \"../$(PACKAGE)\")" \
+	--eval "(uiop:quit)"
 	mv src/$(PACKAGE) $(PACKAGE)
 
 $(CONF_PATH_FILE):
@@ -117,7 +117,9 @@ $(CONF_PATH_FILE):
 
 	echo "(alexandria:define-constant +catalog-dir+"        >> $(CONF_PATH_FILE);
 	echo -e "\""$(localedir)"\" :test #'string=)\n"         >> $(CONF_PATH_FILE);
-
+if !COMPILE_GUI
+	echo "(push :no-gui *features*)"                        >> $(CONF_PATH_FILE);
+endif
 	cat  $(CONF_PATH_FILE).in | sed "\/^;;.*$\/d"           >> $(CONF_PATH_FILE);
 
 dist-hook:
diff --git a/Makefile.in b/Makefile.in
index daf98a1..53c8253 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -296,6 +296,7 @@ GIT = @GIT@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GPG = @GPG@
+GUI = @GUI@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -1123,11 +1124,11 @@ uninstall-man: uninstall-man1
 
 $(PACKAGE): $(CONF_PATH_FILE) *.asd src/*
 	$(LISP_COMPILER) \
-		--dynamic-space-size $(DYNAMIC_MEMORY_SIZE) \
-		--eval "(require 'asdf)" \
-		--eval "(push \"$$(pwd)/\" asdf:*central-registry*)" \
-		--eval "(asdf:make '$(PACKAGE) :build-pathname \"../$(PACKAGE)\")" \
-		--eval "(uiop:quit)"
+	--dynamic-space-size $(DYNAMIC_MEMORY_SIZE) \
+	--eval "(require 'asdf)" \
+	--eval "(push \"$$(pwd)/\" asdf:*central-registry*)" \
+	--eval "(asdf:make '$(PACKAGE) :build-pathname \"../$(PACKAGE)\")" \
+	--eval "(uiop:quit)"
 	mv src/$(PACKAGE) $(PACKAGE)
 
 $(CONF_PATH_FILE):
@@ -1141,7 +1142,7 @@ $(CONF_PATH_FILE):
 
 	echo "(alexandria:define-constant +catalog-dir+"        >> $(CONF_PATH_FILE);
 	echo -e "\""$(localedir)"\" :test #'string=)\n"         >> $(CONF_PATH_FILE);
-
+@COMPILE_GUI_FALSE@	echo "(push :no-gui *features*)"                        >> $(CONF_PATH_FILE);
 	cat  $(CONF_PATH_FILE).in | sed "\/^;;.*$\/d"           >> $(CONF_PATH_FILE);
 
 dist-hook:
diff --git a/configure b/configure
index bb06881..1eb43eb 100755
--- a/configure
+++ b/configure
@@ -665,6 +665,9 @@ ZIP
 UNZIP
 GPG
 CURL
+COMPILE_GUI_FALSE
+COMPILE_GUI_TRUE
+GUI
 DYNAMIC_MEMORY_SIZE
 LISP_COMPILER_ECL
 LISP_COMPILER
@@ -793,6 +796,7 @@ with_libiconv_prefix
 with_libintl_prefix
 with_ecl
 with_dynamic_memory_size
+enable_gui
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1438,6 +1442,7 @@ Optional Features:
   --disable-dependency-tracking
                           speeds up one-time build
   --disable-rpath         do not hardcode runtime library paths
+  --enable-gui            enable GUI default: 'enabled'
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -7312,6 +7317,28 @@ fi
 DYNAMIC_MEMORY_SIZE=$DYNAMIC_MEMORY_SIZE
 
 
+# Check whether --enable-gui was given.
+if test ${enable_gui+y}
+then :
+  enableval=$enable_gui; GUI=yes
+else case e in #(
+  e) GUI=no ;;
+esac
+fi
+
+
+GUI=$GUI
+
+
+ if test "$GUI" != "yes"; then
+  COMPILE_GUI_TRUE=
+  COMPILE_GUI_FALSE='#'
+else
+  COMPILE_GUI_TRUE='#'
+  COMPILE_GUI_FALSE=
+fi
+
+
 # Extract the first word of "curl", so it can be a program name with args.
 set dummy curl; ac_word=$2
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -8741,6 +8768,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${COMPILE_GUI_TRUE}" && test -z "${COMPILE_GUI_FALSE}"; then
+  as_fn_error $? "conditional \"COMPILE_GUI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_COMPLETION_TRUE}" && test -z "${ENABLE_COMPLETION_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_COMPLETION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index 0522c41..3494f0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,12 @@ AC_ARG_WITH([dynamic-memory-size], [AS_HELP_STRING([--with-dynamic-memory-size=s
 
 AC_SUBST(DYNAMIC_MEMORY_SIZE,[$DYNAMIC_MEMORY_SIZE])
 
+AC_ARG_ENABLE([gui], [AS_HELP_STRING([--enable-gui], [enable GUI default: 'enabled'])], [GUI=yes], [GUI=no])
+
+AC_SUBST(GUI,[$GUI])
+
+AM_CONDITIONAL([COMPILE_GUI],[test "$GUI" != "yes"])
+
 AC_PATH_PROG([CURL],[curl],[no])
 
 if test "$CURL" = "no" ; then