diff --git a/man/blockattack.man b/man/blockattack.man
index c4cfdd8..a3a3b85 100644
--- a/man/blockattack.man
+++ b/man/blockattack.man
@@ -1,15 +1,17 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.2.
-.TH BLOCKATTACK "6" "March 2016" "blockattack : Block Attack - Rise of the Blocks 2.0.0-SNAPSHOT" "Games"
+.TH BLOCKATTACK "6" "March 2016" "blockattack 2.0.0-SNAPSHOT" "Games"
 .SH NAME
-blockattack \- manual page for blockattack : Block Attack - Rise of the Blocks 2.0.0-SNAPSHOT
+blockattack \- manual page for blockattack 2.0.0-SNAPSHOT
 .SH SYNOPSIS
 .B blockattack
 [\fI\,OPTION\/\fR]...
 .SH DESCRIPTION
 Block Attack \- Rise of the blocks 2.0.0\-SNAPSHOT
 .PP
+Block Attack \- Rise of the Blocks is a puzzle/blockfall game inspired by Tetris Attack for the SNES.
+.PP
 www.blockattack.net
-.SS "Allowed options:"
+.SH OPTIONS
 .TP
 \fB\-h\fR [ \fB\-\-help\fR ]
 Displays this message
@@ -44,9 +46,11 @@ Start the game normally
 .TP
 blockattack \-\-nosound
 Start the game without sound. Can be used if sound problems prevents the game from starting
+.SH "REPORTING BUGS"
+Report bugs to the issue tracker here: <https://github.com/blockattack/blockattack\-game/issues>
 .SH COPYRIGHT
 Copyright \(co 2005\-2016 Poul Sander
-License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
+License GPLv2+: GNU GPL version 2 <http://www.gnu.org/licenses/old\-licenses/gpl\-2.0.html> or later <http://gnu.org/licenses/gpl.html>
 .br
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/source/code/main.cpp b/source/code/main.cpp
index 27b1bef..2ab6894 100644
--- a/source/code/main.cpp
+++ b/source/code/main.cpp
@@ -1493,7 +1493,7 @@ int main(int argc, char* argv[]) {
 			//NULL on Windows
 			commandname = argv[0];
 		}
-		boost::program_options::options_description desc("Allowed options", consoleWidth);
+		boost::program_options::options_description desc("Options", consoleWidth);
 		desc.add_options()
 		("help,h", "Displays this message")
 		("version", "Display the version information")
@@ -1529,18 +1529,22 @@ int main(int argc, char* argv[]) {
 		}
 		if (vm.count("help")) {
 			cout << SPrintStringF("Block Attack - Rise of the blocks %s\n\n"
+									"Block Attack - Rise of the Blocks is a puzzle/blockfall game inspired by Tetris Attack for the SNES.\n\n"
 			                      "%s\n\n", VERSION_NUMBER, "www.blockattack.net");
 			cout << "Usage: "<< commandname << " [OPTION]..." << endl;
 			cout << desc << endl;
 			cout << "Examples:" << endl;
-			cout << "\tblockattack\t Start the game normally" << endl;
+			cout << "\tblockattack          \tStart the game normally" << endl;
 			cout << "\tblockattack --nosound\tStart the game without sound. Can be used if sound problems prevents the game from starting" << endl;
+			cout << endl;
+			cout << "Report bugs to the issue tracker here: <https://github.com/blockattack/blockattack-game/issues>" << endl;
 			return 0;
 		}
 		if (vm.count("version")) {
-			cout << "blockattack : Block Attack - Rise of the Blocks " << VERSION_NUMBER << endl;
+			cout << "blockattack " << VERSION_NUMBER << endl;
+			cout << endl;
 			cout << "Copyright (C) 2005-2016 Poul Sander" << endl;
-			cout << "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>" << endl;
+			cout << "License GPLv2+: GNU GPL version 2 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html> or later <http://gnu.org/licenses/gpl.html>" << endl;
 			cout << "This is free software: you are free to change and redistribute it." << endl;
 			cout << "There is NO WARRANTY, to the extent permitted by law." << endl;
 			return 0;