@@ -36,10 +36,11 @@
 (declare (uses client))
 (declare (uses tests))
 (declare (uses genexample))
 (declare (uses daemon))
 (declare (uses db))
+(declare (uses dcommon))
 
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
@@ -1900,14 +1901,19 @@
 	      ;; (import csi)
 	      (import readline)
 	      (import apropos)
 	      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
 	      (include "readline-fix.scm")
-	      (gnu-history-install-file-manager
-	       (string-append
-		(or (get-environment-variable "HOME") ".") "/.megatest_history"))
-	      (current-input-port (make-gnu-readline-port "megatest> "))
+	      (if *use-new-readline*
+		  (begin
+		    (install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])
+		    (current-input-port (make-readline-port "megatest> ")))
+		  (begin
+		    (gnu-history-install-file-manager
+		     (string-append
+		      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
+		    (current-input-port (make-gnu-readline-port "megatest> "))))
 	      (if (args:get-arg "-repl")
 		  (repl)
 		  (load (args:get-arg "-load")))
 	      (db:close-all dbstruct))
 	    (exit)))