diff --git a/scripts/daytime.nse b/scripts/daytime.nse
index 02e9d888d..5b7c3a90e 100644
--- a/scripts/daytime.nse
+++ b/scripts/daytime.nse
@@ -1,7 +1,13 @@
 description = [[
-Retrieves the day and time from the UDP Daytime service.
+Retrieves the day and time from the Daytime service.
 ]]
 
+---
+-- @output
+-- PORT   STATE SERVICE
+-- 13/tcp open  daytime
+-- |_daytime: Wed Mar 31 14:48:58 MDT 2010
+
 author = "Diman Todorov"
 
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
diff --git a/scripts/dns-random-srcport.nse b/scripts/dns-random-srcport.nse
index 2ba513b35..2e9c73821 100644
--- a/scripts/dns-random-srcport.nse
+++ b/scripts/dns-random-srcport.nse
@@ -20,6 +20,12 @@ Script: Brandon Enright <bmenrigh@ucsd.edu>\n
 porttest.dns-oarc.net: Duane Wessels <wessels@dns-oarc.net>
 ]]
 
+---
+-- @output
+-- PORT   STATE SERVICE REASON
+-- 53/udp open  domain  udp-response
+-- |_dns-random-srcport: X.X.X.X is GREAT: 26 queries in 1.2 seconds from 26 ports with std dev 17905
+
 -- This script uses (with permission) Duane Wessels' porttest.dns-oarc.net
 -- service.  Duane/OARC believe the service is valuable to the community
 -- and have no plans to ever turn the service off.
diff --git a/scripts/dns-random-txid.nse b/scripts/dns-random-txid.nse
index 24c5fd064..da9353a53 100644
--- a/scripts/dns-random-txid.nse
+++ b/scripts/dns-random-txid.nse
@@ -20,6 +20,12 @@ Script: Brandon Enright <bmenrigh@ucsd.edu>\n
 txidtest.dns-oarc.net: Duane Wessels <wessels@dns-oarc.net>
 ]]
 
+---
+-- @output
+-- PORT   STATE SERVICE REASON
+-- 53/udp open  domain  udp-response
+-- |_dns-random-txid: X.X.X.X is GREAT: 27 queries in 61.5 seconds from 27 txids with std dev 20509
+
 -- This script uses (with permission) Duane Wessels' txidtest.dns-oarc.net
 -- service.  Duane/OARC believe the service is valuable to the community
 -- and have no plans to ever turn the service off.
diff --git a/scripts/dns-recursion.nse b/scripts/dns-recursion.nse
index 8998ac3a5..6316c2f3e 100644
--- a/scripts/dns-recursion.nse
+++ b/scripts/dns-recursion.nse
@@ -5,6 +5,12 @@ Checks if a DNS server allows queries for third-party names.
 It is expected that recursion will be enabled on your own internal nameservers.
 ]]
 
+---
+-- @output
+-- PORT   STATE SERVICE REASON
+-- 53/udp open  domain  udp-response
+-- |_dns-recursion: Recursion appears to be enabled
+
 author = "Felix Groebert"
 
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
diff --git a/scripts/jdwp-version.nse b/scripts/jdwp-version.nse
index 7f248cd80..431a4d3fd 100644
--- a/scripts/jdwp-version.nse
+++ b/scripts/jdwp-version.nse
@@ -11,6 +11,11 @@ author = "Michael Schierl <schierlm@gmx.de>"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"version"}
 
+---
+-- @output
+-- PORT     STATE SERVICE VERSION
+-- 9999/tcp open  jdwp    Java Debug Wire Protocol (Reference Implementation) version 1.6 1.6.0_17
+
 require "comm"
 
 portrule = function(host, port)
diff --git a/scripts/ms-sql-info.nse b/scripts/ms-sql-info.nse
index 2f4f10a81..efd8e10b4 100644
--- a/scripts/ms-sql-info.nse
+++ b/scripts/ms-sql-info.nse
@@ -10,6 +10,17 @@ license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 
 categories = {"default", "discovery", "intrusive"}
 
+---
+-- @output
+-- PORT     STATE SERVICE  REASON
+-- 1434/udp open  ms-sql-m script-set
+-- | ms-sql-info: Discovered Microsoft SQL Server 2008 Express Edition
+-- |   Server name: MAC-MINI
+-- |   Server version: 10.0.2531.0 (SP1)
+-- |   Instance name: SQLEXPRESS
+-- |   TCP Port: 1433
+-- |_    Could not retrieve actual version information
+
 require('stdnse')
 require "shortport"
 require("strbuf")
diff --git a/scripts/p2p-conficker.nse b/scripts/p2p-conficker.nse
index 5ce27540f..ff7cae671 100644
--- a/scripts/p2p-conficker.nse
+++ b/scripts/p2p-conficker.nse
@@ -24,7 +24,7 @@ from public sources (most notably the port blacklisting was found by David Fifie
 out to everybody who contributed! 
 ]]
 
---       <pre>nmap -p445 -T4 -vv --script=p2p-conficker --script-args=realip=\"192.168.1.65\" x.x.x.x</pre>
+---
 -- @args checkconficker If set to '1' or 'true', the script will always run on active hosts, 
 --       it doesn't matter if any open ports were detected. 
 --
diff --git a/scripts/smb-enum-domains.nse b/scripts/smb-enum-domains.nse
index 979e6c639..171b069d6 100644
--- a/scripts/smb-enum-domains.nse
+++ b/scripts/smb-enum-domains.nse
@@ -26,11 +26,11 @@ After the initial <code>bind</code> to SAMR, the sequence of calls is:
 ]]
 
 ---
---@usage
+-- @usage
 -- nmap --script smb-enum-domains.nse -p445 <host>
 -- sudo nmap -sU -sS --script smb-enum-domains.nse -p U:137,T:139 <host>
 --
---@output
+-- @output
 -- Host script results:
 -- | smb-enum-domains:
 -- |   WINDOWS2000
@@ -46,8 +46,6 @@ After the initial <code>bind</code> to SAMR, the sequence of calls is:
 -- |     Creation time: 2009-10-17 12:45:46
 -- |     Passwords: min length: n/a; min age: n/a days; max age: 42 days; history: n/a passwords
 -- |_    Account lockout disabled
---
-
 -----------------------------------------------------------------------
 
 author = "Ron Bowes"
diff --git a/scripts/snmp-brute.nse b/scripts/snmp-brute.nse
index 12df738b4..02079d73f 100644
--- a/scripts/snmp-brute.nse
+++ b/scripts/snmp-brute.nse
@@ -7,6 +7,11 @@ Attempts to find an SNMP community string by brute force guessing.
 -- @args snmpcommunity The SNMP community string to use. If not supplied, this
 -- script will not run.
 -- @args snmplist The filename of a list of community strings to try.
+--
+-- @output
+-- PORT    STATE SERVICE
+-- 161/udp open  snmp
+-- |_snmp-brute: public
 
 author = "Philip Pickering"
 
diff --git a/scripts/sshv1.nse b/scripts/sshv1.nse
index 83b8b2c9b..c65843ceb 100644
--- a/scripts/sshv1.nse
+++ b/scripts/sshv1.nse
@@ -5,6 +5,12 @@ author = "Brandon Enright"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"default", "safe"}
 
+---
+-- @output
+-- PORT   STATE SERVICE
+-- 22/tcp open  ssh
+-- |_sshv1: Server supports SSHv1
+
 require "shortport"
 
 portrule = shortport.port_or_service(22, "ssh")
diff --git a/scripts/x11-access.nse b/scripts/x11-access.nse
index f510d8779..49b630935 100644
--- a/scripts/x11-access.nse
+++ b/scripts/x11-access.nse
@@ -12,6 +12,7 @@ the "xhost +" list. In this case, script will display the message: "X
 server access is granted".
 ]]
 
+---
 -- @output
 -- Host script results:
 -- |_ x11-access: X server access is granted