diff --git a/scripts/dns-client-subnet-scan.nse b/scripts/dns-client-subnet-scan.nse
index a9b9da92f..c5e3c9657 100644
--- a/scripts/dns-client-subnet-scan.nse
+++ b/scripts/dns-client-subnet-scan.nse
@@ -47,7 +47,7 @@ requests using a given subnet.
 -- @args dns-client-subnet.nameserver [optional] nameserver to use.  (default = host.ip)
 --
 
-author = "John Bond"
+author = "John R. Bond"
 license = "Simplified (2-clause) BSD license--See http://nmap.org/svn/docs/licenses/BSD-simplified"
 categories = {"discovery", "safe"}
 
diff --git a/scripts/dns-nsec-enum.nse b/scripts/dns-nsec-enum.nse
index 9f278c49f..ade2c1fd8 100644
--- a/scripts/dns-nsec-enum.nse
+++ b/scripts/dns-nsec-enum.nse
@@ -43,7 +43,7 @@ servers that use NSEC3 rather than NSEC; for that, see
 -- |     snorlax.example.com
 -- |_    vulpix.example.com
 
-author = "John Bond"
+author = "John R. Bond"
 license = "Simplified (2-clause) BSD license--See http://nmap.org/svn/docs/licenses/BSD-simplified"
 
 categories = {"discovery", "intrusive"}
diff --git a/scripts/dns-nsec3-enum.nse b/scripts/dns-nsec3-enum.nse
index 46d8f508f..8ab8e6f91 100644
--- a/scripts/dns-nsec3-enum.nse
+++ b/scripts/dns-nsec3-enum.nse
@@ -72,7 +72,7 @@ References:
 -- |   nexthash 430456af8svfvl98l66shhrgucoip7mi mges520acstgaviekurg3oksh9u31bmb
 -- |_  Total hashes found: 8
 
-author = "Aleksandar Nikolic, John Bond"
+author = "Aleksandar Nikolic, John R. Bond"
 license = "Simplified (2-clause) BSD license--See http://nmap.org/svn/docs/licenses/BSD-simplified"
 categories = {"discovery", "intrusive"}
 
diff --git a/scripts/dns-nsid.nse b/scripts/dns-nsid.nse
index add9b27ba..2d5699c4d 100644
--- a/scripts/dns-nsid.nse
+++ b/scripts/dns-nsid.nse
@@ -29,7 +29,7 @@ References:
 -- |_  bind.version: 9.7.3-P3
 ---
 
-author = "John Bond"
+author = "John R. Bond"
 license = "Simplified (2-clause) BSD license--See http://nmap.org/svn/docs/licenses/BSD-simplified"
 
 categories = {"discovery", "default"}
diff --git a/scripts/dns-random-srcport.nse b/scripts/dns-random-srcport.nse
index 3864c1f45..f42da1ad0 100644
--- a/scripts/dns-random-srcport.nse
+++ b/scripts/dns-random-srcport.nse
@@ -20,7 +20,7 @@ porttest query to the DNS server running on the target.
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 
 author = [[
-Script: Brandon Enright <bmenrigh@ucsd.edu>\n
+Script: Brandon Enright <bmenrigh@ucsd.edu>
 porttest.dns-oarc.net: Duane Wessels <wessels@dns-oarc.net>
 ]]
 
diff --git a/scripts/dns-random-txid.nse b/scripts/dns-random-txid.nse
index e76bb3eed..39756d550 100644
--- a/scripts/dns-random-txid.nse
+++ b/scripts/dns-random-txid.nse
@@ -20,7 +20,7 @@ txidtest query to the DNS server running on the target.
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 
 author = [[
-Script: Brandon Enright <bmenrigh@ucsd.edu>\n
+Script: Brandon Enright <bmenrigh@ucsd.edu>
 txidtest.dns-oarc.net: Duane Wessels <wessels@dns-oarc.net>
 ]]
 
diff --git a/scripts/flume-master-info.nse b/scripts/flume-master-info.nse
index 69fc10baa..45a7a3adb 100644
--- a/scripts/flume-master-info.nse
+++ b/scripts/flume-master-info.nse
@@ -80,7 +80,7 @@ Namp scan queue.
 --|     mapred.task.tracker.http.address: 0.0.0.0:50060
 --|_    mapred.task.tracker.report.address: 127.0.0.1:0
 
-author = "John R. Bond (john.r.bond@gmail.com)"
+author = "John R. Bond"
 license = "Simplified (2-clause) BSD license--See http://nmap.org/svn/docs/licenses/BSD-simplified"
 categories = {"default", "discovery", "safe"}
 
diff --git a/scripts/hadoop-namenode-info.nse b/scripts/hadoop-namenode-info.nse
index bf6a70416..3768a7e92 100644
--- a/scripts/hadoop-namenode-info.nse
+++ b/scripts/hadoop-namenode-info.nse
@@ -47,7 +47,7 @@ For more information about Hadoop, see:
 ---
 
 
-author = "John R. Bond (john.r.bond@gmail.com)"
+author = "John R. Bond"
 license = "Simplified (2-clause) BSD license--See http://nmap.org/svn/docs/licenses/BSD-simplified"
 categories = {"default", "discovery", "safe"}
 
diff --git a/scripts/http-awstatstotals-exec.nse b/scripts/http-awstatstotals-exec.nse
index 1d28dbd07..98aa03b23 100644
--- a/scripts/http-awstatstotals-exec.nse
+++ b/scripts/http-awstatstotals-exec.nse
@@ -40,7 +40,7 @@ References:
 -- http.useragent - User Agent to use in GET request
 --
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"vuln", "intrusive", "exploit"}
 
diff --git a/scripts/http-axis2-dir-traversal.nse b/scripts/http-axis2-dir-traversal.nse
index 83b926ec2..8659fbed6 100644
--- a/scripts/http-axis2-dir-traversal.nse
+++ b/scripts/http-axis2-dir-traversal.nse
@@ -38,7 +38,7 @@ Reference:
 -- @args http.useragent User Agent used in the GET requests
 ---
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"vuln", "intrusive", "exploit"}
 
diff --git a/scripts/http-cakephp-version.nse b/scripts/http-cakephp-version.nse
index 36c04f24d..f80ff41f9 100644
--- a/scripts/http-cakephp-version.nse
+++ b/scripts/http-cakephp-version.nse
@@ -21,7 +21,7 @@ For more information about CakePHP visit: http://www.cakephp.org/.
 -- | Version of icons: 1.2.x
 -- | Version of stylesheet: 1.2.6
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"discovery","safe"}
 
diff --git a/scripts/http-default-accounts.nse b/scripts/http-default-accounts.nse
index 323e5372e..8dae6035d 100644
--- a/scripts/http-default-accounts.nse
+++ b/scripts/http-default-accounts.nse
@@ -59,7 +59,7 @@ This script was based on http-enum.
 --   * added support for target_check()
 ---
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"discovery", "auth", "safe"}
 
diff --git a/scripts/http-google-malware.nse b/scripts/http-google-malware.nse
index 5a6988fd1..4c4bd90d7 100644
--- a/scripts/http-google-malware.nse
+++ b/scripts/http-google-malware.nse
@@ -29,7 +29,7 @@ http://code.google.com/apis/safebrowsing/key_signup.html
 -- @args http-google-malware.api API key for Google's Safe Browsing Lookup service
 ---
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"malware", "discovery", "safe", "external"}
 
diff --git a/scripts/http-huawei-hg5xx-vuln.nse b/scripts/http-huawei-hg5xx-vuln.nse
index d46f2547d..621297eca 100644
--- a/scripts/http-huawei-hg5xx-vuln.nse
+++ b/scripts/http-huawei-hg5xx-vuln.nse
@@ -50,7 +50,7 @@ References:
 -- |_      http://websec.ca/advisories/view/Huawei-HG520c-3.10.18.x-information-disclosure
 ---
 
-author = "Paulino Calderon <calderon () websec mx>"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"exploit","vuln"}
 
diff --git a/scripts/http-joomla-brute.nse b/scripts/http-joomla-brute.nse
index a5d0fccd8..ec8391ff5 100644
--- a/scripts/http-joomla-brute.nse
+++ b/scripts/http-joomla-brute.nse
@@ -53,7 +53,7 @@ Joomla's default uri and form names:
 -- Based on Patrik Karlsson's http-form-brute
 --
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"intrusive", "brute"}
 
diff --git a/scripts/http-litespeed-sourcecode-download.nse b/scripts/http-litespeed-sourcecode-download.nse
index 2256a23d9..97fdf1684 100644
--- a/scripts/http-litespeed-sourcecode-download.nse
+++ b/scripts/http-litespeed-sourcecode-download.nse
@@ -33,7 +33,7 @@ References:
 -- @args http-litespeed-sourcecode-download.uri URI path to remote file
 ---
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"vuln", "intrusive", "exploit"}
 
diff --git a/scripts/http-majordomo2-dir-traversal.nse b/scripts/http-majordomo2-dir-traversal.nse
index 8b45a0c34..854571530 100644
--- a/scripts/http-majordomo2-dir-traversal.nse
+++ b/scripts/http-majordomo2-dir-traversal.nse
@@ -36,7 +36,7 @@ For more information about this vulnerability:
 -- * http.useragent - Sets user agent
 -- 
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"intrusive", "vuln", "exploit"}
 
diff --git a/scripts/http-method-tamper.nse b/scripts/http-method-tamper.nse
index 9df15954c..2a6f3faee 100644
--- a/scripts/http-method-tamper.nse
+++ b/scripts/http-method-tamper.nse
@@ -51,7 +51,7 @@ References:
 -- @args http-method-tamper.timeout Web crawler timeout. Default: 10s
 ---
 
-author = "Paulino Calderon <calderon()websec.mx>"
+author = "Paulino Calderon <calderon@websec.mx>"
 
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 
diff --git a/scripts/http-phpself-xss.nse b/scripts/http-phpself-xss.nse
index 81ff43dd7..3c6697f82 100644
--- a/scripts/http-phpself-xss.nse
+++ b/scripts/http-phpself-xss.nse
@@ -39,7 +39,7 @@ The attack vector/probe used is: <code>/'"/><script>alert(1)</script></code>
 -- |_      http://php.net/manual/en/reserved.variables.server.php
 -- @args http-phpself-xss.uri URI. Default: /
 -- @args http-phpself-xss.timeout Spidering timeout. (default 10s)
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"fuzzer", "intrusive", "vuln"}
 
diff --git a/scripts/http-tplink-dir-traversal.nse b/scripts/http-tplink-dir-traversal.nse
index f182fb14f..95428d746 100644
--- a/scripts/http-tplink-dir-traversal.nse
+++ b/scripts/http-tplink-dir-traversal.nse
@@ -57,7 +57,7 @@ Other interesting files:
 -- * http.useragent - Sets user agent
 -- 
 
-author = "Paulino Calderon <calderon()websec.mx>"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"vuln", "exploit"}
 
diff --git a/scripts/http-trace.nse b/scripts/http-trace.nse
index 6f7d2dd80..c47dfac36 100644
--- a/scripts/http-trace.nse
+++ b/scripts/http-trace.nse
@@ -23,7 +23,7 @@ Sends an HTTP TRACE request and shows if the method TRACE is enabled. If debug i
 --
 -- @args http-trace.path Path to URI
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 
diff --git a/scripts/http-vuln-cve2012-1823.nse b/scripts/http-vuln-cve2012-1823.nse
index 52b42b441..b38c9939b 100644
--- a/scripts/http-vuln-cve2012-1823.nse
+++ b/scripts/http-vuln-cve2012-1823.nse
@@ -47,7 +47,7 @@ TODO:
 -- @args http-vuln-cve2012-1823.uri URI. Default: /index.php
 ---
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"exploit","vuln","intrusive"}
 
diff --git a/scripts/http-waf-detect.nse b/scripts/http-waf-detect.nse
index 8480442cd..ed4ae3485 100644
--- a/scripts/http-waf-detect.nse
+++ b/scripts/http-waf-detect.nse
@@ -46,7 +46,7 @@ following products:
 -- http.useragent User Agent for HTTP requests
 -- http.pipeline Number of requests sent in the single request
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"discovery", "intrusive"}
 
diff --git a/scripts/http-wordpress-brute.nse b/scripts/http-wordpress-brute.nse
index 8b93c57f3..e6789b48d 100644
--- a/scripts/http-wordpress-brute.nse
+++ b/scripts/http-wordpress-brute.nse
@@ -51,7 +51,7 @@ Wordpress default uri and form names:
 -- Based on Patrik Karlsson's http-form-brute
 --
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"intrusive", "brute"}
 
diff --git a/scripts/http-wordpress-enum.nse b/scripts/http-wordpress-enum.nse
index 0b5ba99de..a35267a99 100644
--- a/scripts/http-wordpress-enum.nse
+++ b/scripts/http-wordpress-enum.nse
@@ -34,7 +34,7 @@ Original advisory:
 -- @args http-wordpress-enum.out If set it saves the username list in this file.
 ---
 
-author = "Paulino Calderon"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"auth", "intrusive", "vuln"}
 
diff --git a/scripts/http-xssed.nse b/scripts/http-xssed.nse
index 02c1c0f6c..a8c467efb 100644
--- a/scripts/http-xssed.nse
+++ b/scripts/http-xssed.nse
@@ -23,7 +23,7 @@ This script searches the xssed.com database and outputs the result.
 -- |_    /myBook/myregion.php?targetUrl=javascript:alert(1);
 ---
 
-author = {'George Chatzisofroniou'}
+author = "George Chatzisofroniou"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"safe", "external", "discovery"}
 
diff --git a/scripts/mysql-vuln-cve2012-2122.nse b/scripts/mysql-vuln-cve2012-2122.nse
index 2ebfb9f6d..d39a87d1f 100644
--- a/scripts/mysql-vuln-cve2012-2122.nse
+++ b/scripts/mysql-vuln-cve2012-2122.nse
@@ -79,7 +79,7 @@ local table = require "table"
 local vulns = require "vulns"
 local openssl = stdnse.silent_require "openssl"
 
-author = "Paulino Calderon <calderon()websec.mx>"
+author = "Paulino Calderon <calderon@websec.mx>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"discovery", "intrusive", "vuln"}
 
diff --git a/scripts/targets-asn.nse b/scripts/targets-asn.nse
index 7729b620b..84fb5199b 100644
--- a/scripts/targets-asn.nse
+++ b/scripts/targets-asn.nse
@@ -30,7 +30,7 @@ http://www.shadowserver.org/wiki/pmwiki.php/Services/IP-BGP
 -- |     128.12.0.0/16
 -- |_    171.64.0.0/14
 
-author = "John Bond"
+author = "John R. Bond"
 license = "Simplified (2-clause) BSD license--See http://nmap.org/svn/docs/licenses/BSD-simplified"
 
 categories = {"discovery", "external", "safe"}