diff --git a/__init__.py b/__init__.py
index 48986f3..4f4ae10 100644
--- a/__init__.py
+++ b/__init__.py
@@ -2,7 +2,7 @@
 version = '0.1'
 copyright = """\
 Copyright 2014 Red Hat, Inc.
-Licensed under GPLv2
+Licensed under GPLv2+
 """.rstrip()
 # XXX eventually there should be precise plugin authorship tracking
 author = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com> and plugin authors"
diff --git a/command.py b/command.py
index d0dd617..5b40a6b 100644
--- a/command.py
+++ b/command.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Base command stuff (TBD)"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/command_context.py b/command_context.py
index 1e9df42..09ef47e 100644
--- a/command_context.py
+++ b/command_context.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Command context, i.e., state distributed along filters chain"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/command_manager.py b/command_manager.py
index 2b30e1d..5b5b0d8 100644
--- a/command_manager.py
+++ b/command_manager.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Command manager"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/commands/ccs2pcs.py b/commands/ccs2pcs.py
index 99b3e3c..9dc91d1 100644
--- a/commands/ccs2pcs.py
+++ b/commands/ccs2pcs.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """ccs2pcs command"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/commands/ccs_obfuscate.py b/commands/ccs_obfuscate.py
index 08d939b..09d9aa4 100644
--- a/commands/ccs_obfuscate.py
+++ b/commands/ccs_obfuscate.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """ccs-obfuscate command"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/completion.py b/completion.py
index 1ffa59b..c66ce7d 100644
--- a/completion.py
+++ b/completion.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Shell completion formatters"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/error.py b/error.py
index 5aafec5..f69a28a 100644
--- a/error.py
+++ b/error.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Base exception classes and exit code definitions"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/filter.py b/filter.py
index 1ade14b..55b3a2c 100644
--- a/filter.py
+++ b/filter.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Base filter stuff (metaclass, decorator, etc.)"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/filter_manager.py b/filter_manager.py
index da974a8..acceab0 100644
--- a/filter_manager.py
+++ b/filter_manager.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Filter manager"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/filters/XML2simpleconfig.py b/filters/XML2simpleconfig.py
index 0a5ef7f..ae3df11 100644
--- a/filters/XML2simpleconfig.py
+++ b/filters/XML2simpleconfig.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """xml2simpleconfig filter"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/filters/ccs2ccs_pcmk.py b/filters/ccs2ccs_pcmk.py
index dbf34d3..443817c 100644
--- a/filters/ccs2ccs_pcmk.py
+++ b/filters/ccs2ccs_pcmk.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """ccs2ccs_pcmk filter"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/filters/ccs2coro.py b/filters/ccs2coro.py
index 9953593..7cc0229 100644
--- a/filters/ccs2coro.py
+++ b/filters/ccs2coro.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """ccs2coro filter"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/filters/ccs2flatccs.py b/filters/ccs2flatccs.py
index 4581de3..5ff5b87 100644
--- a/filters/ccs2flatccs.py
+++ b/filters/ccs2flatccs.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """ccs2flatccs filter"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/filters/ccs_obfuscate.py b/filters/ccs_obfuscate.py
index 0e57e3e..02f3df9 100644
--- a/filters/ccs_obfuscate.py
+++ b/filters/ccs_obfuscate.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """obfuscation filters for ccs"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/filters/cib/configuration/__init__.py b/filters/cib/configuration/__init__.py
index fc00b3a..46d22fd 100644
--- a/filters/cib/configuration/__init__.py
+++ b/filters/cib/configuration/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
 
diff --git a/filters/cib/configuration/resources/__init__.py b/filters/cib/configuration/resources/__init__.py
index 126cdfb..549dea5 100644
--- a/filters/cib/configuration/resources/__init__.py
+++ b/filters/cib/configuration/resources/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
 pcs2simplepcs = '''\
diff --git a/filters/cluster/__init__.py b/filters/cluster/__init__.py
index 172dc1c..9d8e1e2 100644
--- a/filters/cluster/__init__.py
+++ b/filters/cluster/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
 # XXX a bit dirty approach
diff --git a/filters/cluster/clusternodes/__init__.py b/filters/cluster/clusternodes/__init__.py
index eaf4193..e9471a7 100644
--- a/filters/cluster/clusternodes/__init__.py
+++ b/filters/cluster/clusternodes/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 ccs2needlexml = '''\
     <nodelist>
diff --git a/filters/cluster/clusternodes/clusternode/__init__.py b/filters/cluster/clusternodes/clusternode/__init__.py
index c7ad80b..67e5bb0 100644
--- a/filters/cluster/clusternodes/clusternode/__init__.py
+++ b/filters/cluster/clusternodes/clusternode/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 ccs2needlexml = '''\
     <node>
diff --git a/filters/cluster/clusternodes/clusternode/fence/__init__.py b/filters/cluster/clusternodes/clusternode/fence/__init__.py
index a974da1..39e34cb 100644
--- a/filters/cluster/clusternodes/clusternode/fence/__init__.py
+++ b/filters/cluster/clusternodes/clusternode/fence/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 ccs_obfuscate_identifiers = '''\
 
diff --git a/filters/cluster/clusternodes/clusternode/fence/method/device.py b/filters/cluster/clusternodes/clusternode/fence/method/device.py
index ec69c39..f3ad031 100644
--- a/filters/cluster/clusternodes/clusternode/fence/method/device.py
+++ b/filters/cluster/clusternodes/clusternode/fence/method/device.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 from logging import getLogger
 log = getLogger(__name__)
diff --git a/filters/cluster/cman/__init__.py b/filters/cluster/cman/__init__.py
index 2147f74..1dbdc4e 100644
--- a/filters/cluster/cman/__init__.py
+++ b/filters/cluster/cman/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 ccs2needlexml = '''\
     <quorum provider="corosync_votequorum">
diff --git a/filters/cluster/fencedevices/__init__.py b/filters/cluster/fencedevices/__init__.py
index 4b18b5d..28f2fa2 100644
--- a/filters/cluster/fencedevices/__init__.py
+++ b/filters/cluster/fencedevices/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 ccs2ccs_pcmk = '''\
     <fencedevices>
diff --git a/filters/cluster/fencedevices/fencedevice.py b/filters/cluster/fencedevices/fencedevice.py
index d6ffbb5..0ea8206 100644
--- a/filters/cluster/fencedevices/fencedevice.py
+++ b/filters/cluster/fencedevices/fencedevice.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 flatccs2pcs = '''\
     <template id="{concat('FENCEDEV-', @name)}"
diff --git a/filters/cluster/logging/__init__.py b/filters/cluster/logging/__init__.py
index 0f3c2f2..e72bd6a 100644
--- a/filters/cluster/logging/__init__.py
+++ b/filters/cluster/logging/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 ccs2needlexml = '''\
     <logging>
diff --git a/filters/cluster/logging/logging_daemon/__init__.py b/filters/cluster/logging/logging_daemon/__init__.py
index bc9b053..7b8a994 100644
--- a/filters/cluster/logging/logging_daemon/__init__.py
+++ b/filters/cluster/logging/logging_daemon/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 ccs2needlexml = '''\
     <xsl:if test="@name='corosync' and @subsys">
diff --git a/filters/cluster/quorumd/__init__.py b/filters/cluster/quorumd/__init__.py
index b8ccefe..fba1992 100644
--- a/filters/cluster/quorumd/__init__.py
+++ b/filters/cluster/quorumd/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 ccs_obfuscate_identifiers = '''\
     <xsl:copy>
diff --git a/filters/cluster/rm/__init__.py b/filters/cluster/rm/__init__.py
index a4d78a5..67ff309 100644
--- a/filters/cluster/rm/__init__.py
+++ b/filters/cluster/rm/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
 # avoid accidental start of rgmanager, see bz#723925;
diff --git a/filters/cluster/totem/__init__.py b/filters/cluster/totem/__init__.py
index 89f60cb..cc78a32 100644
--- a/filters/cluster/totem/__init__.py
+++ b/filters/cluster/totem/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 ccs2needlexml = '''\
     <xsl:copy-of select="@*[
diff --git a/filters/cluster/totem/interface/__init__.py b/filters/cluster/totem/interface/__init__.py
index 4809a7d..90371a0 100644
--- a/filters/cluster/totem/interface/__init__.py
+++ b/filters/cluster/totem/interface/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 ccs2needlexml = '''\
     <xsl:copy>
diff --git a/filters/flatccs2pcs.py b/filters/flatccs2pcs.py
index d26aa9a..cdf46ae 100644
--- a/filters/flatccs2pcs.py
+++ b/filters/flatccs2pcs.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """flatccs2pcs filter"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/filters/pcs2simplepcs.py b/filters/pcs2simplepcs.py
index 038fc62..eb5580f 100644
--- a/filters/pcs2simplepcs.py
+++ b/filters/pcs2simplepcs.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """pcs2simplepcs filter"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/format.py b/format.py
index ed832ef..5f63fad 100644
--- a/format.py
+++ b/format.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Base format stuff (metaclass, classes, etc.)"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/format_manager.py b/format_manager.py
index 6b74260..0498931 100644
--- a/format_manager.py
+++ b/format_manager.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Format manager"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/formats/ccs.py b/formats/ccs.py
index d0a43f8..d7f2f94 100644
--- a/formats/ccs.py
+++ b/formats/ccs.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Cluster configuration system (ccs) format"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/formats/coro.py b/formats/coro.py
index 55a1766..de4f97c 100644
--- a/formats/coro.py
+++ b/formats/coro.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2013 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Corosync executive configuration"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/formats/pcs.py b/formats/pcs.py
index 6200c8d..0411372 100644
--- a/formats/pcs.py
+++ b/formats/pcs.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2013 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Pacemaker configuration system (pcs) format"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/formats/simpleconfig.py b/formats/simpleconfig.py
index e65b0cb..d5ff5a4 100644
--- a/formats/simpleconfig.py
+++ b/formats/simpleconfig.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Structured configuration formats such as corosync.conf"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/main-bootstrap b/main-bootstrap
index ed02f94..30b1ff8 100755
--- a/main-bootstrap
+++ b/main-bootstrap
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Machinery entry point -- to be run from in-repo location"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/main.py b/main.py
index a24d266..2ad8104 100644
--- a/main.py
+++ b/main.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Machinery entry point"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/plugin_registry.py b/plugin_registry.py
index 463c41d..484dffe 100644
--- a/plugin_registry.py
+++ b/plugin_registry.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Easy (at least for usage) plugin framework"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/runtests.sh b/runtests.sh
index 663211a..65aa26c 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2013 Red Hat, Inc.                                                
 # Part of clufter project                                                     
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 
 # Specific tests can be specified as per [1], e.g.:
 #    tests.filter.XMLTraverse.testXSLTTemplate
diff --git a/script/clufter b/script/clufter
index 87821d4..f68254f 100755
--- a/script/clufter
+++ b/script/clufter
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """The launcher"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/tests/_bootstrap.py b/tests/_bootstrap.py
index c6fc0c7..ca92b4a 100644
--- a/tests/_bootstrap.py
+++ b/tests/_bootstrap.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2013 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Bootstrap the environment for testing"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/tests/_common.py b/tests/_common.py
index 7731061..becea9a 100644
--- a/tests/_common.py
+++ b/tests/_common.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2013 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Common base for testing"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/tests/ccs2coroxml.py b/tests/ccs2coroxml.py
index bedc899..32240b6 100644
--- a/tests/ccs2coroxml.py
+++ b/tests/ccs2coroxml.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Testing ccs2coro filter(s)"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/tests/ccs2needle_xslt.py b/tests/ccs2needle_xslt.py
index 72ddb67..77f6534 100644
--- a/tests/ccs2needle_xslt.py
+++ b/tests/ccs2needle_xslt.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Testing destilling XSLT from the sparse tree-organized snippets"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/tests/command.py b/tests/command.py
index f82afbe..bf3ead4 100644
--- a/tests/command.py
+++ b/tests/command.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Testing command"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/tests/command_manager.py b/tests/command_manager.py
index d33de75..39fd2c2 100644
--- a/tests/command_manager.py
+++ b/tests/command_manager.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Testing command manager"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/tests/filter.py b/tests/filter.py
index 3bddcd9..e5f84c2 100644
--- a/tests/filter.py
+++ b/tests/filter.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2013 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Testing filter"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/tests/filter_manager.py b/tests/filter_manager.py
index 211b715..9aa9fa6 100644
--- a/tests/filter_manager.py
+++ b/tests/filter_manager.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Testing filter manager"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/tests/format.py b/tests/format.py
index 8ddce9b..f651f6c 100644
--- a/tests/format.py
+++ b/tests/format.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2013 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Testing format"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/tests/format_manager.py b/tests/format_manager.py
index 4da1c0a..c2b80c4 100644
--- a/tests/format_manager.py
+++ b/tests/format_manager.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2013 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Testing format manager"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/tests/utils.py b/tests/utils.py
index 557a11c..0bc95f3 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Testing utils module"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/utils.py b/utils.py
index 9be58ec..4bcd274 100644
--- a/utils.py
+++ b/utils.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Various helpers"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
 
diff --git a/utils_func.py b/utils_func.py
index 4143130..2d3bc72 100644
--- a/utils_func.py
+++ b/utils_func.py
@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2014 Red Hat, Inc.
 # Part of clufter project
-# Licensed under GPLv2 (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
 """Various functional-paradigm helpers"""
 __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"