diff --git a/ConfigurePlugin/data/System/ConfigurePlugin.txt b/ConfigurePlugin/data/System/ConfigurePlugin.txt
index 499f1318c9..c569447773 100644
--- a/ConfigurePlugin/data/System/ConfigurePlugin.txt
+++ b/ConfigurePlugin/data/System/ConfigurePlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1411582947" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1411624271" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Plugins"}%
 <!--
 One line description, required for extensions repository catalog.
@@ -33,11 +33,6 @@ Users of the =configure= interface access it through the CGI script in
 =bin/configure=. The UI is self-explanatory and needs no further introduction
 here.
 
-The plugin also provides a =%<nop>DEPENDENCYREPORT% macro for use in
-wiki topics.  The dependency report analyzes the identified perl
-dependencies for %WIKITOOLNAME% and all installed extensions, and
-reports any issues with installed versions of the dependencies.
-
 Of interest to developers may be the JSON RPC interface provided by the
 plugin, which gives access to the Foswiki configuration to web clients
 (who must, of course, be authenticated as admins to make RPC calls).
diff --git a/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin.pm b/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin.pm
index dbebf3946f..60e640bbf5 100644
--- a/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin.pm
+++ b/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin.pm
@@ -1,11 +1,17 @@
 # See bottom of file for default license and copyright information
 
+# Note on separation of concerns: Please *do not* add anything to this
+# plugin that is not specific to the Javascript 'configure' interface.
+# Generic functionality related to configuration should be implemented
+# in the core. The ConfigurePlugin is *just* for handling the UI, no more.
+
 # Note that POD in this module is included in the documentation topic
 # by BuildContrib
 
 =pod
 
 ---++ Remote Procedure Call (RPC) interface
+
 RPC calls are handled via the =JsonRpcContrib=. Callers must authenticate
 as admins, or the request will be rejected with a 403 status.
 
@@ -33,7 +39,7 @@ use Foswiki::Configure::Reporter     ();
 use Foswiki::Configure::Checker      ();
 use Foswiki::Configure::Wizard       ();
 
-our $RELEASE          = '29 May 2013';
+our $RELEASE          = '25 Sep 2014';
 our $SHORTDESCRIPTION = '=configure= interface using json-rpc';
 
 our $NO_PREFS_IN_TOPIC = 1;
@@ -105,35 +111,10 @@ sub initPlugin {
         }
     }
 
-    Foswiki::Func::registerTagHandler( 'DEPENDENCYREPORT',
-        \&_DEPENDENCYREPORT );
-
     return 1;
 
 }
 
-sub _DEPENDENCYREPORT {
-    my ( $session, $params, $topic, $web ) = @_;
-
-    require Foswiki::Plugins::ConfigurePlugin::DependencyReport;
-
-    print STDERR "PARAM = ($params->{_DEFAULT}) \n"
-      if defined $params->{_DEFAULT};
-
-    if ( defined $params->{_DEFAULT}
-        && $params->{_DEFAULT} =~ m/'?extensions'?/ )
-    {
-        return
-          Foswiki::Plugins::ConfigurePlugin::DependencyReport::analyzeExtensions(
-          );
-    }
-    else {
-        return
-          Foswiki::Plugins::ConfigurePlugin::DependencyReport::analyzeFoswiki();
-    }
-
-}
-
 sub _JSONwrap {
     my $method = shift;
     return sub {
@@ -169,18 +150,18 @@ sub _JSONwrap {
 }
 
 # Canonicalise a key string
-sub safeKeys {
+sub _safeKeys {
     my $k = shift;
     $k =~ s/^{(.*)}$/$1/;
     return '{'
       . join( '}{',
-        map { $_ =~ s/^(['"])(.*)\1$/$2/; safeKey($_) }
+        map { $_ =~ s/^(['"])(.*)\1$/$2/; _safeKey($_) }
           split( /}{/, $k ) )
       . '}';
 }
 
 # Make a single key safe for use in a canonical key string
-sub safeKey {
+sub _safeKey {
     my $k = shift;
     return $k if ( $k =~ /^[a-z_][a-z0-9_]*$/i );
     $k =~ s/'/\\'/g;
@@ -733,7 +714,7 @@ sub changecfg {
 /^($Foswiki::Plugins::ConfigurePlugin::SpecEntry::configItemRegex)$/;
 
             # Implicit untaint
-            $key = safeKeys($1);
+            $key = _safeKeys($1);
             if ( eval "exists \$Foswiki::cfg$key" ) {
                 print STDERR "Cleared $key\n" if TRACE;
                 $cleared++;
@@ -748,7 +729,7 @@ sub changecfg {
 /^($Foswiki::Plugins::ConfigurePlugin::SpecEntry::configItemRegex)$/;
 
             # Implicit untaint
-            $key = safeKeys($1);
+            $key = _safeKeys($1);
             if ( eval "exists \$Foswiki::cfg$key" ) {
                 my $oval = eval "\$Foswiki::cfg$key";
                 if ( ref($oval) || $oval =~ /^[0-9]+$/ ) {
@@ -815,7 +796,7 @@ sub _lscify {
     }
     if ( ref($data) eq 'HASH' ) {
         foreach my $sk ( sort keys %$data ) {
-            my $c = _lscify( $specs, $data->{$sk}, ( @path, safeKey($sk) ) );
+            my $c = _lscify( $specs, $data->{$sk}, ( @path, _safeKey($sk) ) );
             push( @content, @$c );
         }
     }
diff --git a/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin/MANIFEST b/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin/MANIFEST
index 7b099f574a..52372d8a86 100644
--- a/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin/MANIFEST
+++ b/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin/MANIFEST
@@ -1,12 +1,9 @@
 !noci
 bin/configure
 data/System/ConfigurePlugin.txt 0644 Documentation page
-data/System/DependencyReport.txt 0644 System dependency report
-data/System/VarDEPENDENCYREPORT.txt 0644 Documentation page
 lib/Foswiki/Plugins/ConfigurePlugin.pm 0444 Perl module
 lib/Foswiki/Plugins/ConfigurePlugin/Config.spec 0444 Configuration
 lib/Foswiki/Plugins/ConfigurePlugin/JQuery.pm 0444 Configuration
-lib/Foswiki/Plugins/ConfigurePlugin/DependencyReport.pm 0444 Configuration
 pub/System/ConfigurePlugin/checkWhirly.gif 0444
 pub/System/ConfigurePlugin/configure.css 0444
 pub/System/ConfigurePlugin/configure.css.gz 0444
diff --git a/core/data/System/InstallationGuide.txt b/core/data/System/InstallationGuide.txt
index d072fd23cc..f1978449ac 100644
--- a/core/data/System/InstallationGuide.txt
+++ b/core/data/System/InstallationGuide.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1408949368" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1411624271" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminDocumentationCategory"}%
 ---+!! Installation Guide
 
@@ -229,6 +229,7 @@ In order to keep your user, group, and site configuration information separate f
 If you are having problems with your installation, try the following:
 
    * Run the =configure= script and ensure you have resolved all errors and are satisfied that you understand any warnings.
+   * Review the [[%SYSTEMWEB%.PerlDependencyReport]] and sure all dependencies are correctly resolved.
    * Consult the topics at Foswiki:Support.SupplementalDocuments and Foswiki:Support.AskedQuestions.
    * Ask for help on [[Foswiki:Community.InternetRelayChat][IRC]] (irc.freenode.net, channel #foswiki). There are often a number of people waiting to help.
    * Ask a question in the Foswiki:Support web
diff --git a/core/data/System/PerlDependencyReport.txt b/core/data/System/PerlDependencyReport.txt
new file mode 100644
index 0000000000..e321a5d847
--- /dev/null
+++ b/core/data/System/PerlDependencyReport.txt
@@ -0,0 +1,27 @@
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1411624271" format="1.1" reprev="1" version="1"}%
+%META:TOPICPARENT{name="InstallationGuide"}%
+
+---+!! Perl dependencies for Foswiki and Extensions
+
+This topic lists the perl module dependencies required by the Foswiki core
+and installed extensions. It is designed to help administrators analyse and
+resolve missing perl dependencies.
+
+The module name links to the module information on the
+[[https://metacpan.org][Comprehensive Perl Archive Network (CPAN)]].
+In the report, all users of the module are identified (including the Foswiki
+core).  If a minimum version can be determined identified, the extension
+requiring the highest minimum version is underlined.
+
+%TOC%
+
+<noautolink>
+---++ Foswiki dependencies
+
+%PERLDEPENDENCYREPORT%
+
+---++ Foswiki extension dependencies
+
+%PERLDEPENDENCYREPORT{'extensions'}%
+</noautolink>
+
diff --git a/core/data/System/VarPERLDEPENDENCYREPORT.txt b/core/data/System/VarPERLDEPENDENCYREPORT.txt
new file mode 100644
index 0000000000..5e5f02d236
--- /dev/null
+++ b/core/data/System/VarPERLDEPENDENCYREPORT.txt
@@ -0,0 +1,11 @@
+%META:TOPICINFO{author="ProjectContributor" date="1411624271" format="1.1" version="1"}%
+%META:TOPICPARENT{name="macros"}%
+#VarPERLDEPENDENCYREPORT
+---+++ PERLDEPENDENCYREPORT -- report the perl module dependencies and status for Foswiki core and extensions
+   * Syntax: =%<nop>PERLDEPENDENCYREPORT%=
+---+++ DEPENDENCYREPORT{"extensions"} -- report the perl module dependencies for the installed extensions
+   * Syntax: =%<nop>PERLDEPENDENCYREPORT{"extensions"}%=
+   * Supported parameters:
+     | *Parameter:* | *Description:* | *Default:* |
+     | ="extensions"= | The word ="extensions" - requests dependencies of installed extensions. | (not set) |
+   * See also: %SYSTEMWEB%.PerlDependencyReport
diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
index d9f5b7095f..c4b076ab93 100644
--- a/core/lib/Foswiki.pm
+++ b/core/lib/Foswiki.pm
@@ -246,19 +246,20 @@ BEGIN {
 
           #deprecated functionality, now implemented using %ENV%
           sub { $_[0]->{request}->header('Host') || '' },
-        HTTP         => undef,
-        HTTPS        => undef,
-        ICON         => undef,
-        ICONURL      => undef,
-        ICONURLPATH  => undef,
-        IF           => undef,
-        INCLUDE      => undef,
-        INTURLENCODE => undef,
-        LANGUAGE     => sub { $_[0]->i18n->language(); },
-        LANGUAGES    => undef,
-        MAKETEXT     => undef,
-        META         => undef,                              # deprecated
-        METASEARCH   => undef,                              # deprecated
+        HTTP                 => undef,
+        HTTPS                => undef,
+        ICON                 => undef,
+        ICONURL              => undef,
+        ICONURLPATH          => undef,
+        IF                   => undef,
+        INCLUDE              => undef,
+        INTURLENCODE         => undef,
+        LANGUAGE             => sub { $_[0]->i18n->language(); },
+        LANGUAGES            => undef,
+        MAKETEXT             => undef,
+        META                 => undef,                              # deprecated
+        METASEARCH           => undef,                              # deprecated
+        PERLDEPENDENCYREPORT => undef,
         NOP =>
 
           # Remove NOP tag in template topics but show content.
diff --git a/core/lib/Foswiki/Contrib/core/MANIFEST b/core/lib/Foswiki/Contrib/core/MANIFEST
index bb90f70a43..3db0fe8dea 100644
--- a/core/lib/Foswiki/Contrib/core/MANIFEST
+++ b/core/lib/Foswiki/Contrib/core/MANIFEST
@@ -135,6 +135,7 @@ data/System/MetaData.txt 0644
 data/System/ObjectMethod.txt 0644
 data/System/PageCaching.txt 0644
 data/System/ParentList.txt 0644
+data/System/PerlDependencyReport.txt 0644
 data/System/PerlDoc.txt 0644
 data/System/PlainSkin.txt 0644
 data/System/Plugins.txt 0644
@@ -258,6 +259,7 @@ data/System/VarNOTIFYTOPIC.txt 0644
 data/System/VarOLIVE.txt 0644
 data/System/VarORANGE.txt 0644
 data/System/VarP.txt 0644
+data/System/VarPERLDEPENDENCYREPORT.txt 0644 System dependency report
 data/System/VarPINK.txt 0644
 data/System/VarPLUGINDESCRIPTIONS.txt 0644
 data/System/VarPLUGINVERSION.txt 0644
@@ -619,6 +621,7 @@ lib/Foswiki/Macros/LANGUAGES.pm 0444
 lib/Foswiki/Macros/MAKETEXT.pm 0444
 lib/Foswiki/Macros/META.pm 0444
 lib/Foswiki/Macros/METASEARCH.pm 0444
+lib/Foswiki/Macros/PERLDEPENDENCYREPORT.pm 0444 Configuration
 lib/Foswiki/Macros/PUBURL.pm 0444
 lib/Foswiki/Macros/QUERY.pm 0444
 lib/Foswiki/Macros/QUERYPARAMS.pm 0444
diff --git a/core/lib/Foswiki/Macros/PERLDEPENDENCYREPORT.pm b/core/lib/Foswiki/Macros/PERLDEPENDENCYREPORT.pm
new file mode 100644
index 0000000000..5b5e662b97
--- /dev/null
+++ b/core/lib/Foswiki/Macros/PERLDEPENDENCYREPORT.pm
@@ -0,0 +1,281 @@
+# See bottom of file for license and copyright information
+package Foswiki;
+
+# Detailed core and plugin dependency report - see
+# System.VarPERLDEPENDENCYREPORT and System.PerlDependencyReport
+
+use strict;
+use warnings;
+
+use Foswiki::Configure::Dependency ();
+use Foswiki::Configure::FileUtil   ();
+
+sub PERLDEPENDENCYREPORT {
+    my ( $this, $params ) = @_;
+
+    if ( defined $params->{_DEFAULT}
+        && $params->{_DEFAULT} eq 'extensions' )
+    {
+        return _analyzeExtensions();
+    }
+    else {
+        return _analyzeFoswiki();
+    }
+
+}
+
+sub _analyzeFoswiki {
+
+    my $content;
+
+    # Check that each of the required Perl modules can be found
+    # and read, and  print its version number.  Keep this section last
+    # so it does not hide shorter and more frequently accessed information.
+
+    # File DEPENDENCIES is in the lib dir (Item3478)
+    my $from = Foswiki::Configure::FileUtil::findFileOnPath('Foswiki.spec');
+    my @dir  = File::Spec->splitdir($from);
+    pop(@dir);    # Cutting off trailing Foswiki.spec gives us lib dir
+    $from =
+      File::Spec->catfile( @dir, 'Foswiki', 'Contrib', 'core', 'DEPENDENCIES' );
+
+    my %seen;
+    my $perlModules = _loadDEPENDENCIES( $from, 'core', \%seen );
+    $content .= _showDEPENDENCIES( 'core', $perlModules );
+
+    return $content;
+}
+
+sub _analyzeExtensions {
+
+    my $content;
+
+    # File DEPENDENCIES is in the lib dir (Item3478)
+
+    my $from = Foswiki::Configure::FileUtil::findFileOnPath('Foswiki.spec');
+    my @dir  = File::Spec->splitdir($from);
+    pop(@dir);    # Cutting off trailing Foswiki.spec gives us lib dir
+    $from =
+      File::Spec->catfile( @dir, 'Foswiki', 'Contrib', 'core', 'DEPENDENCIES' );
+
+    my %seen;
+    my $perlModules = _loadDEPENDENCIES( $from, 'core', \%seen );
+
+    foreach my $info ( values %seen ) {
+        if ( $info->{usage} ) {
+            $info->{usage} =~ s,^\s?<br />,<br /><strong>Foswiki: </strong>,;
+        }
+    }
+    my %extns = (
+        $from => 1,
+        File::Spec->catfile( @dir, 'Foswiki', 'Plugins', 'EmptyPlugin' ) => 1,
+        File::Spec->catfile( @dir, 'TWiki',   'Plugins', 'EmptyPlugin' ) => 1,
+    );
+    foreach my $dir (@INC) {
+        _findDependencies( $dir, '/Foswiki/Plugins', \%extns,
+            $perlModules, \%seen );
+        _findDependencies( $dir, '/Foswiki/Contrib', \%extns,
+            $perlModules, \%seen );
+        _findDependencies( $dir, '/TWiki/Plugins', \%extns,
+            $perlModules, \%seen );
+        _findDependencies( $dir, '/TWiki/Contrib', \%extns,
+            $perlModules, \%seen );
+    }
+
+    $content .= _showDEPENDENCIES( 'Extensions', $perlModules, 1 );
+
+    return $content;
+}
+
+sub _findDependencies {
+    my ( $dir, $path, $extns, $perlModules, $seen ) = @_;
+
+    my $dh;
+    my $dpath = File::Spec->catdir( $dir, $path );
+
+    return unless ( opendir( $dh, $dpath ) );
+
+    foreach my $extn ( grep !/^\./, readdir $dh ) {
+        $extn =~ /^(.*)$/;
+        $extn = $1;
+        my $dfile = File::Spec->catfile( $dpath, $extn, 'DEPENDENCIES' );
+        next if ( $extns->{$dfile} || !-e $dfile );
+        push @$perlModules, @{ _loadDEPENDENCIES( $dfile, $extn, $seen ) };
+        $extns->{$dfile} = 1;
+    }
+    closedir($dh);
+}
+
+sub _showDEPENDENCIES {
+    my $who         = shift;
+    my $perlModules = shift;
+    my $users       = shift;
+
+ # I suppose this needs a word of explanation:
+ # The primary sort is by module name (multi-level split by ::)
+ # If $users is false, we are processing the core, which the UI calls 'Foswiki'.
+ # No user information is necessary, as only core data is present.
+ # Otherwise, we have both the core and extensions dependencies.  We
+ # skip modules used only by the core, but have merged core and all extensions.
+ # So a module used by extensions and the core is also displayed with the
+ # extensions, as either may have the highest version constraint.  The highest
+ # version constraint is underlined (unless there's only one user)
+
+    my $set;
+    if ( ref($perlModules) ) {
+        my @list = map {
+            my $mvu = $_->[0]{minVersionUser};
+            $mvu = 'Foswiki' if ( $mvu eq 'core' );
+            my $mu = @{ $_->[0]{users} } > 1;
+            $_->[0]{usage} .= ' <br><b>Used by:</b> '
+              . join( ', ',
+                map { $_ eq $mvu && $mu ? "<u>[[$_]]</u>" : "[[$_]]" }
+                  sort map { $_ eq 'core' ? '%WIKITOOLNAME%' : $_ }
+                  @{ $_->[0]{users} } )
+              if ($users);
+            $_->[0]
+          } sort {
+            my @a = @{ $a->[1] };
+            my @b = @{ $b->[1] };
+            while ( @a && @b ) {
+                my $na = shift @a;
+                my $nb = shift @b;
+                my $c  = $na cmp $nb;
+                return $c if ($c);
+            }
+            return @a <=> @b;
+          } map {
+            ( $users && @{ $_->{users} } == 1 && $_->{users}[0] eq 'core' )
+              ? ()
+              : [ $_, [ split( /::/, $_->{name} ) ] ]
+          } @$perlModules;
+
+        Foswiki::Configure::Dependency::checkPerlModules(@list);
+
+        foreach (@list) {
+
+     #SMELL: Something is inserting newlines, breaking the table. This fixes it.
+            $_->{check_result} =~
+              s/(?>\x0D\x0A?|[\x0A-\x0C\x85\x{2028}\x{2029}])//sg;
+            my $ok =
+              ( $_->{ok} )
+              ? ''
+              : '<span class="foswikiAlert">%X% Possible missing dependency!</span><br/>';
+            $set .= "| CPAN:$_->{name} | $ok$_->{check_result} |\n";
+        }
+    }
+    else {
+        $set = $perlModules;
+    }
+
+    $who = 'Foswiki' if ( $who eq 'core' );
+    return "Perl modules used by $who \n" . $set;
+}
+
+# Extract a list of the perl modules that are required by a DEPENDENCIES file.
+# We also keep track of who uses each module, and the maximum version
+# constraint.  Multiple user notes are labeled and merged.
+
+sub _loadDEPENDENCIES {
+    my $from = shift;
+    my $who  = shift;
+    my $seen = shift;
+
+    my $dwho = $who;
+    $dwho = 'Foswiki' if ( $who eq 'core' );
+    $dwho = "<strong>$dwho</strong>";
+
+    my $d;
+    open( $d, '<', $from ) || return "Failed to load $from: $!";
+    my @perlModules;
+
+    foreach my $line (<$d>) {
+        next unless $line;
+        my @row = split( /,\s*/, $line, 4 );
+        next unless ( scalar(@row) == 4 && $row[2] eq 'cpan' );
+        my ( $cond, $ver ) = $row[1] =~ m/^([=<>!]*)(.*)$/;
+        $cond ||= '>=';
+        $row[0] =~ /([\w:]+)/;    # check and untaint
+        my $modname = $1;
+
+        my ( $dispo, $usage ) = $row[3] =~ /^\s*(\w+)(?:[.,]\s*)?(.*)$/;
+
+        # There's weird stuff in DEPENDENCIES...
+        # required => ERROR; recommended => WARN; default is NOTE
+        #
+        # If not one of the expected keywords, make it a WARN so the
+        # file can be corrected without instilling too much fear.
+        # Also, it's probably part of the usage sentence, so re-combine it.
+
+        if ( $dispo !~ m/^(required|optional|recommended)$/i ) {
+            $dispo = 'recommended';
+            $usage = $row[3];
+        }
+        $usage ||= '';
+
+        # Activate links found in DEPENDENCIES notes.
+
+        my $dlink =
+          '<a class="configureDependenciesLink" target="_blank" href=';
+        $usage =~
+s,\[\[(https?://[^\]]+)\]\[([^\]]+)\](?:\[[^\]]*\])?\],$dlink"$1">$2</a>,gms;
+        $usage =~ s,\[\[(https?://[^\]]+)\]\],$dlink"$1">$1</a>,gms;
+        $usage =~ s,(^|[^"])(https?://.*?)(\s|$),$1$dlink"$2">$2</a>$3,gms;
+
+        if ( ( my $info = $seen->{$modname} ) ) {
+            push @{ $info->{users} }, $who;
+            my $prevVer = $info->{minimumVersion};
+            $prevVer =~ s/(\d+(\.\d*)?).*/$1/;
+            $ver     =~ s/(\d+(\.\d*)?).*/$1/;
+            if ( $ver > $prevVer ) {
+                $info->{minimumVersion} = $ver;
+                $info->{minVersionUser} = $who;
+            }
+            $info->{usage} .= " <br />$dwho: $usage" if ($usage);
+            next;
+        }
+        if ($usage) {
+            if ( $who eq 'core' ) {
+                $usage = " <br />" . ucfirst( lc($dispo) ) . " $usage";
+            }
+            else {
+                $usage = "<br />$dwho: " . ucfirst( lc($dispo) ) . " $usage";
+            }
+        }
+        push(
+            @perlModules,
+            {
+                name           => $modname,
+                usage          => $usage,
+                minimumVersion => $ver || 0,
+                minVersionUser => $who,
+                condition      => $cond,
+                disposition    => lc($dispo),
+                users          => [$who],
+            }
+        );
+        $seen->{$modname} = $perlModules[-1];
+    }
+    close($d);
+    return \@perlModules;
+}
+
+1;
+__END__
+Foswiki - The Free and Open Source Wiki, http://foswiki.org/
+
+Copyright (C) 2014 Foswiki Contributors. Foswiki Contributors
+are listed in the AUTHORS file in the root of this distribution.
+NOTE: Please extend that file, not this notice.
+
+This program is free software; you can redistribute it and/or
+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. For
+more details read LICENSE in the root of this distribution.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+As per the GPL, removal of this notice is prohibited.