diff --git a/applen.conf b/applen.conf
index 23a38df4..234cca27 100644
--- a/applen.conf
+++ b/applen.conf
@@ -1,8 +1,5 @@
 [Configuration]
-Apple2 Type=16
+Apple2 Type=17
 Printer Filename=Printer.txt
-Emulation Speed=10
-CPU Type=1
-
 [Preferences]
 Last Disk Image 1=/home/andrea/projects/cvs/A2E/ANDREA.DSK
diff --git a/source/frontends/ncurses/main.cpp b/source/frontends/ncurses/main.cpp
index cd206c41..8582c414 100644
--- a/source/frontends/ncurses/main.cpp
+++ b/source/frontends/ncurses/main.cpp
@@ -35,6 +35,7 @@ namespace
     std::string snapshot;
     int memclear;
     bool benchmark;
+    bool saveConfigurationOnExit;
 
     bool run;  // false if options include "-h"
   };
@@ -43,7 +44,8 @@ namespace
   {
     po::options_description desc("AppleWin ncurses");
     desc.add_options()
-      ("help,h", "Print this help message");
+      ("help,h", "Print this help message")
+      ("conf", "Save configuration on exit");
 
     po::options_description diskDesc("Disk");
     diskDesc.add_options()
@@ -78,6 +80,8 @@ namespace
 	return false;
       }
 
+      options.saveConfigurationOnExit = vm.count("conf");
+
       if (vm.count("d1"))
       {
 	options.disk1 = vm["d1"].as<std::string>();