diff --git a/src/kleo/stl_util.h b/src/kleo/stl_util.h
--- a/src/kleo/stl_util.h
+++ b/src/kleo/stl_util.h
@@ -4,9 +4,8 @@
 ** This file is part of the KD Tools library.
 **
 ** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
+** GNU General Public License as published by the Free Software Foundation;
+** either version 2 of the License, or (at your option) any later version.
 **
 ** Licensees holding valid commercial KD Tools licenses may use this file in
 ** accordance with the KD Tools Commercial License Agreement provided with
diff --git a/src/ui/cryptoconfigdialog.h b/src/ui/cryptoconfigdialog.h
--- a/src/ui/cryptoconfigdialog.h
+++ b/src/ui/cryptoconfigdialog.h
@@ -5,8 +5,9 @@
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
 
     Libkleopatra is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License,
-    version 2, as published by the Free Software Foundation.
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
 
     Libkleopatra is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ui/cryptoconfigdialog.cpp b/src/ui/cryptoconfigdialog.cpp
--- a/src/ui/cryptoconfigdialog.cpp
+++ b/src/ui/cryptoconfigdialog.cpp
@@ -5,8 +5,9 @@
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
 
     Libkleopatra is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License,
-    version 2, as published by the Free Software Foundation.
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
 
     Libkleopatra is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ui/cryptoconfigmodule.h b/src/ui/cryptoconfigmodule.h
--- a/src/ui/cryptoconfigmodule.h
+++ b/src/ui/cryptoconfigmodule.h
@@ -5,8 +5,9 @@
     Copyright (c) 2004,2005 Klarälvdalens Datakonsult AB
 
     Libkleopatra is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License,
-    version 2, as published by the Free Software Foundation.
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
 
     Libkleopatra is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ui/cryptoconfigmodule.cpp b/src/ui/cryptoconfigmodule.cpp
--- a/src/ui/cryptoconfigmodule.cpp
+++ b/src/ui/cryptoconfigmodule.cpp
@@ -5,8 +5,9 @@
     Copyright (c) 2004 Klar�vdalens Datakonsult AB
 
     Libkleopatra is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License,
-    version 2, as published by the Free Software Foundation.
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
 
     Libkleopatra is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ui/cryptoconfigmodule_p.h b/src/ui/cryptoconfigmodule_p.h
--- a/src/ui/cryptoconfigmodule_p.h
+++ b/src/ui/cryptoconfigmodule_p.h
@@ -5,8 +5,9 @@
     Copyright (c) 2004,2005 Klarälvdalens Datakonsult AB
 
     Libkleopatra is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License,
-    version 2, as published by the Free Software Foundation.
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
 
     Libkleopatra is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ui/kdhorizontalline.h b/src/ui/kdhorizontalline.h
--- a/src/ui/kdhorizontalline.h
+++ b/src/ui/kdhorizontalline.h
@@ -8,9 +8,8 @@
 ** This file is part of the KD Tools library.
 **
 ** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
+** GNU General Public License as published by the Free Software Foundation;
+** either version 2 of the License, or (at your option) any later version.
 **
 ** Licensees holding valid commercial KD Tools licenses may use this file in
 ** accordance with the KD Tools Commercial License Agreement provided with
diff --git a/src/ui/kdhorizontalline.cpp b/src/ui/kdhorizontalline.cpp
--- a/src/ui/kdhorizontalline.cpp
+++ b/src/ui/kdhorizontalline.cpp
@@ -8,9 +8,8 @@
 ** This file is part of the KD Tools library.
 **
 ** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
+** GNU General Public License as published by the Free Software Foundation;
+** either version 2 of the License, or (at your option) any later version.
 **
 ** Licensees holding valid commercial KD Tools licenses may use this file in
 ** accordance with the KD Tools Commercial License Agreement provided with