diff --git a/NEWS b/NEWS
index b0d8111b..ec363311 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+
+*** Current news is available in the ChangeLog file, or in git history ***
+
Noteworthy changes in version 2.5 (2013-06-16)
-------------------------------------------------------
@@ -54,7 +57,7 @@ Noteworthy changes in version 0.0.0-alpha (2008-12-21)
fwknop is distributed under the terms of the GNU General Public License
- (GPL v2).
+ (GPL v2+).
Copyright 2009-2013, Damien Stuart
diff --git a/client/fwknop.8.in b/client/fwknop.8.in
index 610f0cb0..2f95dbc7 100644
--- a/client/fwknop.8.in
+++ b/client/fwknop.8.in
@@ -2,12 +2,12 @@
.\" Title: fwknop
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 05/28/2016
+.\" Date: 06/03/2016
.\" Manual: Fwknop Client
.\" Source: Fwknop Client
.\" Language: English
.\"
-.TH "FWKNOP" "8" "05/28/2016" "Fwknop Client" "Fwknop Client"
+.TH "FWKNOP" "8" "06/03/2016" "Fwknop Client" "Fwknop Client"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -65,7 +65,7 @@ Each of the above fields are separated by a ":" character due to the variable le
.sp
By default, the \fBfwknop\fR client sends authorization packets over UDP port 62201, but this can be altered with the \fB\-\-server\-port\fR argument (this requires \fBfwknopd\fR to be configured to acquire SPA data over the selected port)\&. Also, \fBfwknop\fR can send the SPA packet over a random port via the \fB\-\-rand\-port\fR argument\&. See \fIfwknopd(8)\fR for further details\&. See the \fBEXAMPLES\fR section for example invocations of the \fBfwknop\fR client\&.
.sp
-The \fBfwknop\fR client is quite portable, and is known to run on various Linux distributions (all major distros and embedded ones such as OpenWRT as well), FreeBSD, OpenBSD, and Cygwin on Windows\&. There is also a library \fBlibfko\fR that both \fBfwknop\fR and \fBfwknopd\fR use for SPA packet encryption/decryption and HMAC authentication operations\&. This library can be used to allow third party applications to use SPA subject to the terms of the GNU Public License (GPL)\&.
+The \fBfwknop\fR client is quite portable, and is known to run on various Linux distributions (all major distros and embedded ones such as OpenWRT as well), FreeBSD, OpenBSD, and Cygwin on Windows\&. There is also a library \fBlibfko\fR that both \fBfwknop\fR and \fBfwknopd\fR use for SPA packet encryption/decryption and HMAC authentication operations\&. This library can be used to allow third party applications to use SPA subject to the terms of the GNU Public License (GPL v2+)\&.
.SH "REQUIRED ARGUMENTS"
.sp
These required arguments can be specified via command\-line or from within the \fI~/\&.fwknoprc\fR file (see \fI\-n, \-\-named\-config\fR option and the FWKNOPRC FILE section below)\&.
@@ -1302,4 +1302,4 @@ The phrase \(lqSingle Packet Authorization\(rq was coined by MadHat and Simple N
Send bug reports to dstuart@dstuart\&.org or mbr@cipherdyne\&.org, or open a new issue on Github (see \fIhttps://github\&.com/mrash/fwknop\&.git\fR)\&. Suggestions and/or comments are always welcome as well\&. Additional information may be found in the \fBfwknop\fR mailing list archives (see: \fIhttps://lists\&.sourceforge\&.net/lists/listinfo/fwknop\-discuss\fR)\&.
.SH "DISTRIBUTION"
.sp
-\fBfwknop\fR is distributed under the GNU General Public License (GPL) version 2, and the latest version may be downloaded from \fIhttp://www\&.cipherdyne\&.org\fR\&.
+\fBfwknop\fR is distributed under the GNU General Public License (GPL v2+), and the latest version may be downloaded from \fIhttp://www\&.cipherdyne\&.org\fR\&.
diff --git a/doc/fwknop.man.asciidoc b/doc/fwknop.man.asciidoc
index ac180f19..7b43af95 100644
--- a/doc/fwknop.man.asciidoc
+++ b/doc/fwknop.man.asciidoc
@@ -114,7 +114,7 @@ FreeBSD, OpenBSD, and Cygwin on Windows. There is also a library *libfko*
that both *fwknop* and *fwknopd* use for SPA packet encryption/decryption
and HMAC authentication operations. This library can be used to allow
third party applications to use SPA subject to the terms of the GNU
-Public License (GPL).
+Public License (GPL v2+).
REQUIRED ARGUMENTS
@@ -1123,5 +1123,5 @@ found in the *fwknop* mailing list archives (see:
DISTRIBUTION
------------
-*fwknop* is distributed under the GNU General Public License (GPL) version 2,
+*fwknop* is distributed under the GNU General Public License (GPL v2+),
and the latest version may be downloaded from 'http://www.cipherdyne.org'.
diff --git a/doc/fwknopd.man.asciidoc b/doc/fwknopd.man.asciidoc
index 466efbcc..13709c86 100644
--- a/doc/fwknopd.man.asciidoc
+++ b/doc/fwknopd.man.asciidoc
@@ -874,5 +874,5 @@ found in the *fwknop* mailing list archives (see:
DISTRIBUTION
------------
-*fwknopd* is distributed under the GNU General Public License (GPL), and
+*fwknopd* is distributed under the GNU General Public License (GPL v2+), and
the latest version may be downloaded from 'http://www.cipherdyne.org'.
diff --git a/extras/fwknop-launcher/fwknop-launcher-lsof.pl b/extras/fwknop-launcher/fwknop-launcher-lsof.pl
index 3999d226..bdc40278 100755
--- a/extras/fwknop-launcher/fwknop-launcher-lsof.pl
+++ b/extras/fwknop-launcher/fwknop-launcher-lsof.pl
@@ -22,7 +22,7 @@
#
# Copyright (C) 2011 Michael Rash (mbr@cipherdyne.org)
#
-# License - GNU General Public License version 2 (GPLv2):
+# License - GNU General Public License (GPL v2+):
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/extras/spa-entropy/spa-entropy.pl b/extras/spa-entropy/spa-entropy.pl
index 7d3648e3..d9356ebc 100755
--- a/extras/spa-entropy/spa-entropy.pl
+++ b/extras/spa-entropy/spa-entropy.pl
@@ -9,7 +9,7 @@
#
# Author: Michael Rash
#
-# License: GPL v2
+# License: GPL v2+
#
use MIME::Base64;
diff --git a/fwknop.spec b/fwknop.spec
index b80a8f14..944244f0 100644
--- a/fwknop.spec
+++ b/fwknop.spec
@@ -19,7 +19,7 @@ Release: 1%{?dist}
Summary: Firewall Knock Operator client. An implementation of Single Packet Authorization.
Group: Applications/Internet
-License: GPL
+License: GPL v2+
URL: http://www.cipherdyne.org/fwknop/
Source0: fwknop-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
diff --git a/server/fwknopd.8.in b/server/fwknopd.8.in
index 1215a8e7..fa34650c 100644
--- a/server/fwknopd.8.in
+++ b/server/fwknopd.8.in
@@ -2,12 +2,12 @@
.\" Title: fwknopd
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1
-.\" Date: 05/28/2016
+.\" Date: 06/03/2016
.\" Manual: Fwknop Server
.\" Source: Fwknop Server
.\" Language: English
.\"
-.TH "FWKNOPD" "8" "05/28/2016" "Fwknop Server" "Fwknop Server"
+.TH "FWKNOPD" "8" "06/03/2016" "Fwknop Server" "Fwknop Server"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -993,4 +993,4 @@ The phrase \(lqSingle Packet Authorization\(rq was coined by MadHat and Simple N
Send bug reports to dstuart@dstuart\&.org or mbr@cipherdyne\&.org, or open a new issue on Github (see \fIhttps://github\&.com/mrash/fwknop\&.git\fR)\&. Suggestions and/or comments are always welcome as well\&. Additional information may be found in the \fBfwknop\fR mailing list archives (see: \fIhttps://lists\&.sourceforge\&.net/lists/listinfo/fwknop\-discuss\fR)\&.
.SH "DISTRIBUTION"
.sp
-\fBfwknopd\fR is distributed under the GNU General Public License (GPL), and the latest version may be downloaded from \fIhttp://www\&.cipherdyne\&.org\fR\&.
+\fBfwknopd\fR is distributed under the GNU General Public License (GPL v2+), and the latest version may be downloaded from \fIhttp://www\&.cipherdyne\&.org\fR\&.