diff --git a/bin/foamChangeCopyright b/bin/foamChangeCopyright
index 8d3c7ca5d..902e0740e 100755
--- a/bin/foamChangeCopyright
+++ b/bin/foamChangeCopyright
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 perl -0777 -p -i -e '
-s!(([#%]*) *)License\n.*?\n[#%]*\n.*?\n[#%]*\n.*?\n[#%]*\n.*?\n[#%]*\n!$1License
+s!(([#% ]*) *)License\n.*?\n[#%]*\n.*?\n[#%]*\n.*?\n[#%]*\n.*?\n[#%]*\n!$1License
 $1    This file is part of foam-extend.
 $2
 $1    foam-extend is free software: you can redistribute it and/or modify it
@@ -18,17 +18,11 @@ $1    You should have received a copy of the GNU General Public License
 $1    along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
 $2
 !s;
-s!OpenFOAM: The Open Source CFD Toolbox$!foam-extend: Open Source CFD!m;
-s!\| Copyright(.*?)\n!| For copyright notice see file Copyright\n!s;
-s!\| OpenFOAM: The Open Source CFD Toolbox           \|!| foam-extend: Open Source CFD                    |!;
-s!\| OpenFOAM Extend Project: Open [sS]ource CFD        \|!| foam-extend: Open Source CFD                    |!;
-s!\| Version:  [1-9].[0-9][. -][ex ][x ][t ]                               \|!| Version:     3.1                                |!;
-s!\| Version:     3.0                                \|!| Version:     3.1                                |!;
-s!\| Web:      http://www.OpenFOAM.org               \|!| Web:         http://www.extend-project.de       |!;
-s!\| Web:      www.OpenFOAM.org                      \|!| Web:         http://www.extend-project.de       |!;
-s!\| Web:      www.extend-project.de                 \|!| Web:         http://www.extend-project.de       |!;
-s!\| \\\\      /  F ield         \| foam-extend Project: Open source CFD        \|!| \\\\      /  F ield         | foam-extend: Open Source CFD                    |!;
-s!\|  \\\\    /   O peration     \| Version:  3.0                               \|!|  \\\\    /   O peration     | Version:     3.1                                |!;
-s!README file for version 3.0\*!README file for version 3.1*!;
+s!^(([#%]*) *)\\\\      /  F ield         \|.*!$1\\\\      /  F ield         | foam-extend: Open Source CFD!m;
+s!^(([#%]*) *) \\\\    /   O peration     \|.*!$1 \\\\    /   O peration     | Version:     3.2!m;
+s!^(([#%]*) *)  \\\\  /    A nd           \|.*!$1  \\\\  /    A nd           | Web:         http://www.foam-extend.org!m;
+s!^(([#%]*) *)   \\\\/     M anipulation  \|.*!$1   \\\\/     M anipulation  | For copyright notice see file Copyright!m;
+s!README file for version 3.[01]\*!README file for version 3.2*!;
+s/[ \t]+$//mg;
 ' $1
 
diff --git a/bin/foamUpdateCaseFileHeader b/bin/foamUpdateCaseFileHeader
index 3cdb5c0b5..a2914d406 100755
--- a/bin/foamUpdateCaseFileHeader
+++ b/bin/foamUpdateCaseFileHeader
@@ -1,7 +1,7 @@
 #!/bin/sh
 #------------------------------------------------------------------------------
 # =========                 |
-# \\      /  F ield         | FOAM-extend: Open Source CFD
+# \\      /  F ield         | foam-extend: Open Source CFD
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
@@ -57,7 +57,7 @@ printHeader() {
 | =========                 |                                                 |
 | \\\\      /  F ield         | foam-extend: Open Source CFD                    |
 |  \\\\    /   O peration     | Version:     ${foamVersion}  |
-|   \\\\  /    A nd           | Web:         http://www.extend-project.de       |
+|   \\\\  /    A nd           | Web:         http://www.foam-extend.org         |
 |    \\\\/     M anipulation  |                                                 |
 \\*---------------------------------------------------------------------------*/
 FoamFile