diff --git a/rcon/console.py b/rcon/console.py
index 501494b..ca72c35 100644
--- a/rcon/console.py
+++ b/rcon/console.py
@@ -3,9 +3,6 @@
 from getpass import getpass
 from typing import Union
 
-# For CLI history, etc.
-import readline     # pylint: disable=W0611
-
 from rcon.config import Config
 from rcon.exceptions import RequestIdMismatch, WrongPassword
 from rcon.proto import Client
diff --git a/rcon/rconshell.py b/rcon/rconshell.py
index d84b60b..ba6b711 100644
--- a/rcon/rconshell.py
+++ b/rcon/rconshell.py
@@ -3,6 +3,7 @@
 from argparse import ArgumentParser, Namespace
 from logging import INFO, basicConfig, getLogger
 from pathlib import Path
+from readline import read_history_file, write_history_file
 from socket import timeout
 from sys import exit    # pylint: disable=W0622
 
@@ -21,6 +22,7 @@ ERRORS = (
     (RequestIdMismatch, 'Unexpected request ID mismatch.', 5)
 )
 LOGGER = getLogger('rconshell')
+HIST_FILE = Path.home().joinpath('.rconshell_history')
 
 
 def get_args() -> Namespace:
@@ -40,6 +42,7 @@ def main():
 
     args = get_args()
     basicConfig(level=INFO, format=LOG_FORMAT)
+    read_history_file(HIST_FILE)
 
     if args.server:
         host, port, passwd = get_credentials(args)
@@ -49,4 +52,5 @@ def main():
     with ErrorHandler(ERRORS, LOGGER):
         exit_code = rconcmd(host, port, passwd, prompt=args.prompt)
 
+    write_history_file(HIST_FILE)
     exit(exit_code)