diff --git a/CHANGELOG b/CHANGELOG
index ee97572..dc54fa0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+Jun  3 2018  Integrated man page from @samueloph, change license to BSD 3-clause.
 Jul  3 2009  Compatibility with modern gcc, fixed buffer overflow due to growth
              of OpenSSL SHA1_CTX variable from 64 to 96 bytes.
 Jun  4 2009  Lots of cool stuff including reading hashfiles from stdin,
diff --git a/FAQ b/FAQ
index 476bbac..6502059 100644
--- a/FAQ
+++ b/FAQ
@@ -1,6 +1,6 @@
 coWPAtty - Brute-force dictionary attack against WPA-PSK.
 
-Copyright(c) 2004, Joshua Wright <jwright@hasborg.com>
+Copyright(c) 2004-2018, Joshua Wright <jwright@hasborg.com>
 
 FAQ
 
diff --git a/INSTALL b/INSTALL
index cfc4fba..cf21012 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
 coWPAtty - Brute-force dictionary attack against WPA-PSK.
 
-Copyright(c) 2004-2005, Joshua Wright <jwright@hasborg.com>
+Copyright(c) 2004-2018, Joshua Wright <jwright@hasborg.com>
 
 INSTALLATION
 
diff --git a/README b/README
index 4a9b5ed..a1f8d81 100644
--- a/README
+++ b/README
@@ -1,8 +1,6 @@
 coWPAtty - Brute-force dictionary attack against WPA-PSK.
 
-Copyright(c) 2004-2005, Joshua Wright <jwright@hasborg.com>
-
-$Id: README,v 4.0 2006-07-28 12:23:48 jwright Exp $
+Copyright(c) 2004-2018  Joshua Wright <jwright@hasborg.com>
 
 --------------------------------------------------------------------------------
 
diff --git a/common.h b/common.h
index 4ee5715..d272419 100644
--- a/common.h
+++ b/common.h
@@ -1,9 +1,7 @@
 /*
  * coWPAtty - Brute-force dictionary attack against WPA-PSK.
  *
- * Copyright (c) 2004-2005, Joshua Wright <jwright@hasborg.com>
- *
- * $Id: common.h,v 4.1 2008-03-20 16:49:38 jwright Exp $
+ * Copyright (c) 2004-2018, Joshua Wright <jwright@hasborg.com>
  *
  * This software may be modified and distributed under the terms
  * of the BSD-3-clause license. See the LICENSE file for details.
diff --git a/cowpatty.c b/cowpatty.c
index a2a1569..ee2e80e 100644
--- a/cowpatty.c
+++ b/cowpatty.c
@@ -1,9 +1,7 @@
 /*
  * coWPAtty - Brute-force dictionary attack against WPA-PSK.
  *
- * Copyright (c) 2004-2009, Joshua Wright <jwright@hasborg.com>
- *
- * $Id: cowpatty.c 264 2009-07-03 15:15:50Z jwright $
+ * Copyright (c) 2004-2018, Joshua Wright <jwright@hasborg.com>
  *
  * This software may be modified and distributed under the terms
  * of the BSD-3-clause license. See the LICENSE file for details.
@@ -24,7 +22,7 @@
  */
 
 #define PROGNAME "cowpatty"
-#define VER "4.7"
+#define VER "4.8"
 #define MAXPASSPHRASE 256
 #define DOT1X_LLCTYPE "\x88\x8e"
 
diff --git a/cowpatty.h b/cowpatty.h
index cbda002..dfe5d6e 100644
--- a/cowpatty.h
+++ b/cowpatty.h
@@ -1,9 +1,7 @@
 /*
  * coWPAtty - Brute-force dictionary attack against WPA-PSK.
  *
- * Copyright (c) 2004-2005, Joshua Wright <jwright@hasborg.com>
- *
- * $Id: cowpatty.h,v 4.3 2008-11-12 14:22:27 jwright Exp $
+ * Copyright (c) 2004-2018, Joshua Wright <jwright@hasborg.com>
  *
  * This software may be modified and distributed under the terms
  * of the BSD-3-clause license. See the LICENSE file for details.
diff --git a/genpmk.c b/genpmk.c
index 2d0711d..9a1c1b3 100644
--- a/genpmk.c
+++ b/genpmk.c
@@ -1,9 +1,7 @@
 /*
  * genpmk - Generate a file with precomputed PMK's and words
  *
- * Copyright (c) 2005, Joshua Wright <jwright@hasborg.com>
- *
- * $Id: genpmk.c,v 4.1 2008-03-20 16:49:38 jwright Exp $
+ * Copyright (c) 2004-2018, Joshua Wright <jwright@hasborg.com>
  *
  * This software may be modified and distributed under the terms
  * of the BSD-3-clause license. See the LICENSE file for details.
@@ -26,7 +24,7 @@
 #include "sha1.h"
 
 #define PROGNAME "genpmk"
-#define VER "1.2"
+#define VER "1.3"
 
 /* Globals */
 int sig = 0;			/* Used for handling signals */
diff --git a/md5.h b/md5.h
index 5c798fc..3a459a0 100644
--- a/md5.h
+++ b/md5.h
@@ -1,9 +1,7 @@
 /*
  * coWPAtty - Brute-force dictionary attack against WPA-PSK.
  *
- * Copyright (c) 2004-2005, Joshua Wright <jwright@hasborg.com>
- *
- * $Id: md5.h,v 4.1 2008-03-20 16:49:38 jwright Exp $
+ * Copyright (c) 2004-2018, Joshua Wright <jwright@hasborg.com>
  *
  * This software may be modified and distributed under the terms
  * of the BSD-3-clause license. See the LICENSE file for details.
diff --git a/sha1.c b/sha1.c
index 4952183..c138fd9 100644
--- a/sha1.c
+++ b/sha1.c
@@ -1,9 +1,7 @@
 /*
  * coWPAtty - Brute-force dictionary attack against WPA-PSK.
  *
- * Copyright (c) 2004-2005, Joshua Wright <jwright@hasborg.com>
- *
- * $Id: sha1.c,v 4.2 2008-03-20 16:49:38 jwright Exp $
+ * Copyright (c) 2004-2018, Joshua Wright <jwright@hasborg.com>
  *
  * This software may be modified and distributed under the terms
  * of the BSD-3-clause license. See the LICENSE file for details.
diff --git a/sha1.h b/sha1.h
index a101bbd..56acea3 100644
--- a/sha1.h
+++ b/sha1.h
@@ -1,9 +1,7 @@
 /*
  * coWPAtty - Brute-force dictionary attack against WPA-PSK.
  *
- * Copyright (c) 2004-2005, Joshua Wright <jwright@hasborg.com>
- *
- * $Id: sha1.h,v 4.1 2008-03-20 16:49:38 jwright Exp $
+ * Copyright (c) 2004-2018, Joshua Wright <jwright@hasborg.com>
  *
  * This software may be modified and distributed under the terms
  * of the BSD-3-clause license. See the LICENSE file for details.
diff --git a/utils.c b/utils.c
index dfd5cbb..ef05b65 100644
--- a/utils.c
+++ b/utils.c
@@ -1,9 +1,7 @@
 /*
  * coWPAtty - Brute-force dictionary attack against WPA-PSK.
  *
- * Copyright (c) 2004-2005, Joshua Wright <jwright@hasborg.com>
- *
- * $Id: utils.c,v 4.2 2008-03-20 16:49:38 jwright Exp $
+ * Copyright (c) 2004-2018, Joshua Wright <jwright@hasborg.com>
  *
  * This software may be modified and distributed under the terms
  * of the BSD-3-clause license. See the LICENSE file for details.
diff --git a/utils.h b/utils.h
index d104c68..f7e0584 100644
--- a/utils.h
+++ b/utils.h
@@ -1,9 +1,7 @@
 /*
  * coWPAtty - Brute-force dictionary attack against WPA-PSK.
  *
- * Copyright (c) 2004-2005, Joshua Wright <jwright@hasborg.com>
- *
- * $Id: utils.h,v 4.1 2007-11-03 20:28:39 jwright Exp $
+ * Copyright (c) 2004-2018, Joshua Wright <jwright@hasborg.com>
  *
  * This software may be modified and distributed under the terms
  * of the BSD-3-clause license. See the LICENSE file for details.