diff --git a/Makefile b/Makefile
index 7c6996f..cf406fd 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,10 @@ pretty-code:
 get-roms:
 	make -C dist/ROMs
 
-install: all get-roms
+dist/config.lua: dist/x48ng
+	$^ --print-config > $@
+
+install: all get-roms dist/config.lua
 	install -m 755 -d -- $(DESTDIR)$(PREFIX)/bin
 	install -c -m 755 dist/x48ng $(DESTDIR)$(PREFIX)/bin/x48ng
 
@@ -124,7 +127,6 @@ install: all get-roms
 
 	install -m 755 -d -- $(DESTDIR)$(DOCDIR)
 	cp -R AUTHORS LICENSE README* doc* romdump/ $(DESTDIR)$(DOCDIR)
-	dist/x48ng --print-config > dist/config.lua
 	install -c -m 644 dist/config.lua $(DESTDIR)$(DOCDIR)/config.lua
 
 	install -m 755 -d -- $(DESTDIR)$(PREFIX)/share/applications
diff --git a/dist/config.lua b/dist/config.lua
index 1a98888..bc46abb 100644
--- a/dist/config.lua
+++ b/dist/config.lua
@@ -28,6 +28,7 @@ fullscreen = false
 mono = false
 gray = false
 leave_shift_keys = false
+inhibit_shutdown = false
 
 x11_visual = "default"
 netbook = false
diff --git a/src/runtime_options.c b/src/runtime_options.c
index 3444663..5166923 100644
--- a/src/runtime_options.c
+++ b/src/runtime_options.c
@@ -465,10 +465,8 @@ int parse_args_and_read_config( int argc, char* argv[] )
         fprintf( stderr, "\n" );
     }
 
-    if ( !normalize_config_dir() ) {
+    if ( !normalize_config_dir() )
         fprintf( stderr, "Configuration directory doesn't exist!\n" );
-        exit( 1 );
-    }
 
     /**********************/
     /* 1. read config.lua */
@@ -652,10 +650,9 @@ int parse_args_and_read_config( int argc, char* argv[] )
 
     /* After getting configs and params */
     /* normalize config_dir again in case it's been modified */
-    if ( !normalize_config_dir() ) {
+    if ( !normalize_config_dir() )
         fprintf( stderr, "Configuration directory doesn't exist!\n" );
-        exit( 1 );
-    }
+
     normalize_filenames();
 
     print_config |= verbose;