diff --git a/README b/README
index 097d6d5..526a825 100644
--- a/README
+++ b/README
@@ -18,6 +18,11 @@ Martijn van Brummelen
 RELEASE NOTES
 =============
 
+
+v0.22
+- Use const *banner instead of nwipe_options.banner(Cleanup of code)
+- Update manpage
+
 v0.21
 - Fix ETA not updating properly and bad total throughput display. Thanks (Niels Bassler).
 
diff --git a/configure.ac b/configure.ac
index 999f8ee..5aea6bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.64])
-AC_INIT(nwipe, 0.21, git@brumit.nl)
+AC_INIT(nwipe, 0.22, git@brumit.nl)
 AM_INIT_AUTOMAKE(nwipe, 0.21)
 AC_OUTPUT(Makefile src/Makefile man/Makefile)
 AC_CONFIG_SRCDIR([src/nwipe.c])
diff --git a/man/nwipe.1 b/man/nwipe.1
index 2da43f0..1e7304e 100644
--- a/man/nwipe.1
+++ b/man/nwipe.1
@@ -1,4 +1,4 @@
-.TH NWIPE "1" "October 2014" "nwipe version 0.17" "User Commands"
+.TH NWIPE "1" "February 2017" "nwipe version 0.22" "User Commands"
 .SH NAME
 nwipe \- securely erase disks
 .SH SYNOPSIS
@@ -78,11 +78,10 @@ PRNG option (mersenne|twister|isaac)
 \fB\-r\fR, \fB\-\-rounds\fR=\fINUM\fR
 Number of times to wipe the device using the selected method (default: 1)
 .SH BUGS
-Please see the sourceforge site for the latest list
-(http://nwipe.sourceforge.net)
+Please see the github site for the latest list
+(https://github.com/martijnvanbrummelen/nwipe/issues)
 .SH AUTHOR
-Nwipe was released  by Andy Beverley <andy@andybev.com>
-as modified version of dwipe from DBAN by Darik Horn <dajhorn-dban@vanadac.com>.
+Nwipe is developed by Martijn van Brummelen <github@brumit.nl>
 .SH "SEE ALSO"
 .BR shred (1),
 .BR dwipe (1),
diff --git a/src/gui.c b/src/gui.c
index ef7af8c..d1cb416 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -229,7 +229,7 @@ void nwipe_gui_init( void )
 	wclear( header_window );
 
 	/* Print the product banner. */
-	nwipe_gui_title( header_window, nwipe_options.banner );
+	nwipe_gui_title( header_window, banner );
 
 	/* Create the footer window. */
 	footer_window = newwin( NWIPE_GUI_FOOTER_H, NWIPE_GUI_FOOTER_W, NWIPE_GUI_FOOTER_Y, NWIPE_GUI_FOOTER_X );
diff --git a/src/options.c b/src/options.c
index 5d63b88..eda478e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -100,15 +100,6 @@ int nwipe_options_parse( int argc, char** argv )
 		{ 0, 0, 0, 0 }
 	};
 
-	/* Note that COLS isn't available until ncurses is initialized. */
-	nwipe_options.banner = malloc( nwipe_banner_size );
-
-	/* Set the default product banner. */
-	/* TODO: Add version constant.     */
-	strncpy ( nwipe_options.banner, program_name, nwipe_banner_size);
-	strncat ( nwipe_options.banner, " ", nwipe_banner_size - strlen (nwipe_options.banner) - 1);
-	strncat ( nwipe_options.banner, version_string, nwipe_banner_size - strlen (nwipe_options.banner) - 1);
-	strncat ( nwipe_options.banner, " (based on DBAN's dwipe - Darik's Wipe)", nwipe_banner_size - strlen (nwipe_options.banner) - 1);
 
 	/* Set default options. */
 	nwipe_options.autonuke = 0;
@@ -352,7 +343,7 @@ void nwipe_options_log( void )
 		nwipe_log( NWIPE_LOG_NOTICE, "  do not show GUI interface" );
 	}
 
-	nwipe_log( NWIPE_LOG_NOTICE, "  banner   = %s", nwipe_options.banner );
+	nwipe_log( NWIPE_LOG_NOTICE, "  banner   = %s", banner );
 	nwipe_log( NWIPE_LOG_NOTICE, "  method   = %s", nwipe_method_label( nwipe_options.method ) );
 	nwipe_log( NWIPE_LOG_NOTICE, "  rounds   = %i", nwipe_options.rounds );
 	nwipe_log( NWIPE_LOG_NOTICE, "  sync     = %i", nwipe_options.sync );
diff --git a/src/version.c b/src/version.c
index a543478..7cccdd5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -4,7 +4,7 @@
  * used by configure to dynamically assign those values 
  * to documentation files.
  */
-const char *version_string = "0.21";
+const char *version_string = "0.22";
 const char *program_name   = "nwipe";
 const char *author_name    = "Martijn van Brummelen";
 const char *email_address  = "git@brumit.nl";
@@ -14,3 +14,4 @@ Modifications to original dwipe Copyright Andy Beverley <andy@andybev.com>\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty; not even for MERCHANTABILITY or FITNESS\n\
 FOR A PARTICULAR PURPOSE.\n";
+const char *banner         = "nwipe 0.22 (based on DBAN's dwipe - Darik's Wipe)"
diff --git a/src/version.h b/src/version.h
index 0653610..48999f0 100644
--- a/src/version.h
+++ b/src/version.h
@@ -6,5 +6,6 @@ extern char *program_name;
 extern char *author_name;
 extern char *email_address; 
 extern char *copyright;
+extern char *banner;
 
 #endif/*__VERSION_H*/