diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45030d8..32aed56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
 #### Version history:
+
+###### 0.6.2
+ - Set default address to localhost
+
 ###### 0.6.1
  - Color coding fixed
     * Thanks to Hagb @ Github
diff --git a/mcrcon.1 b/mcrcon.1
index 51ee6ba..4f9b26c 100644
--- a/mcrcon.1
+++ b/mcrcon.1
@@ -17,7 +17,7 @@ It is well suited for remote administration and server maintenance scripts.
 .IP -h
 Print usage
 .IP -H
-Server address
+Server address (default is localhost)
 .IP -P
 Port (default is 25575)
 .IP -p
diff --git a/mcrcon.c b/mcrcon.c
index 1d94ddd..62cd976 100644
--- a/mcrcon.c
+++ b/mcrcon.c
@@ -147,7 +147,10 @@ int main(int argc, char *argv[])
 	if (!port)
 		port = "25575";
 
-	if(argc < 2 && host == NULL && pass == NULL)
+	if (!host)
+		host = "localhost";
+
+	if(argc < 1 && pass == NULL)
 		usage();
 
 	// default getopt error handler enabled
@@ -185,12 +188,6 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (host == NULL)
-	{
-		fputs("Host not defined (-H flag). Try 'mcrcon -h' or 'man mcrcon' for more information.\n\n", stdout);
-		return 0;
-	}
-
 	if (pass == NULL)
 	{
 		fputs("Password not defined (-p flag). Try 'mcrcon -h' 'man mcrcon' for more information.\n\n", stdout);
@@ -240,7 +237,7 @@ void usage(void)
 		"Sends rcon commands to Minecraft server.\n\n"
 		"Option:\n"
 		"  -h\t\tPrint usage\n"
-		"  -H\t\tServer address\n"
+		"  -H\t\tServer address (default is localhost)\n"
 		"  -P\t\tPort (default is 25575)\n"
 		"  -p\t\tRcon password\n"
 		"  -t\t\tInteractive terminal mode\n"