3 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 47ced82..34c50c5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+keysafe (0.20161023) UNRELEASED; urgency=medium
+
+  * Change default for --port to 4242.
+
+ -- Joey Hess <id@joeyh.name>  Sun, 23 Oct 2016 15:30:02 -0400
+
 keysafe (0.20161022) unstable; urgency=medium
 
   * Add keywords to desktop file.
diff --git a/CmdLine.hs b/CmdLine.hs
index 155a628..3ba4e23 100644
--- a/CmdLine.hs
+++ b/CmdLine.hs
@@ -181,7 +181,7 @@ parseServerConfig = ServerConfig
 	<$> option auto
 		( long "port"
 		<> metavar "P"
-		<> value 80
+		<> value 4242
 		<> showDefault
 		<> help "Port for server to listen on."
 		)
@@ -243,4 +243,4 @@ hostPortOption = eitherReader $ \s ->
 		(h, ':':ps) -> case reads ps of
 			[(p, "")] -> Right (h, p)
 			_ -> Left $ "unable to parse port \"" ++ ps ++ "\""
-		(h, _) -> Right (h, 80)
+		(h, _) -> Right (h, 4242)
diff --git a/keysafe.1 b/keysafe.1
index 73d0b4d..a09bf6f 100644
--- a/keysafe.1
+++ b/keysafe.1
@@ -141,7 +141,7 @@ use for backup/restore of keys. Keysafe will use the
 server first before any of its built-in servers.
 .PP
 .IP "--port P"
-Port for server to listen on. (default: 80)
+Port for server to listen on. (default: 4242)
 .PP
 .IP "--address A"
 Address for server to bind to. (Use "*" to bind to