diff --git a/TODO b/TODO
index d4771a2..b2391ee 100644
--- a/TODO
+++ b/TODO
@@ -22,8 +22,6 @@
 TODO
 ----
 
-- Make hostlist -i ...  and allow multiple ones thereof
-
 - Make file xfer noise go away with -s
 
 - Add feature to display names of all possible hostfiles/cmdfiles
diff --git a/makefile b/makefile
index 76c65b5..26c2540 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,4 @@
 # Build a release of 'tsshbatch' using 'make'
-# $Id: makefile,v 1.103 2014/12/04 19:56:10 tundra Exp $
 # Requires a modern 'make' like GNU.
 
 # Uncomment One Of The Following For Early Releases
@@ -20,15 +19,17 @@
 PROGFILES = ${PROGMAIN}
 PROGDOCS  = ${PROGMAIN}.ps
 
-DOCS      = tsshbatch-license.txt   \
-            ${PROGNAME}.1.gz        \
+DOCS      = ${PROGNAME}.1.gz        \
             ${PROGNAME}.html        \
             ${PROGNAME}.pdf         \
             ${PROGNAME}.ps          \
             ${PROGNAME}.rst         \
             ${PROGNAME}.txt         \
+
+SUPPORT   = ${PROGNAME}-license.txt \
             CHANGELOG.txt           \
             Makefile                \
+            WHATSNEW.txt
 
 
 #####
@@ -128,7 +129,7 @@
 	-@git add $@
 	-@git commit -m${HEADER1} $@
 
-docs: ${DOCS} ${PROGDOCS}
+docs: ${DOCS} ${PROGDOCS} ${SUPPORT}
 	@chmod 644 ${DOCS} ${PROGDOCS}
 	@chmod 644 *.gz *.txt
 
@@ -136,13 +137,15 @@
 	@sed -i "s/^GITID.*/GITID      = \'$(shell git log --pretty=format:"%h%x20%an%x20%ad\'" | head -n1)/" ${PROGNAME}.py
 	@sed -i "s/^VERSION.*/VERSION    = \'${VERSION}'/" ${PROGNAME}.py
 
-release: docs WHATSNEW.txt fixrev ${PROGFILES}
-	@mkdir ${DIR}
+release: fixrev docs ${PROGFILES}
+	@mkdir -p ${DIR}/Docs
 	-@mkdir -p ${RELEASES} 2>&1 >/dev/null
-	@cp -pv WHATSNEW.txt ${PROGFILES} ${DOCS} ${PROGDOCS} ${DIR}
+	@cp -pv ${DOCS} ${PROGDOCS} ${DIR}/Docs
+	@cp -pv ${SUPPORT} ${PROGFILES} ${DIR}/
 	@tar -czvf ${TARBALL} --exclude CVS ${DIR}
 	@rm -rf ${DIR}
 	@mv ${DIR}.tar.gz ${RELEASES}
+	@git checkout ${PROGMAIN}
 
 #####
 # Housekeeping
diff --git a/tsshbatch-license.txt b/tsshbatch-license.txt
index 09b8fb6..26c9413 100644
--- a/tsshbatch-license.txt
+++ b/tsshbatch-license.txt
@@ -1,5 +1,3 @@
-$Id: tsshbatch-license.txt,v 1.102 2014/03/27 23:31:54 tundra Exp $
-
 In order to use, study, modify, or copy 'tsshbatch', you must read
 and agree to all the licensing terms below.  If you do not agree with
 or do not understand *ANYTHING* you see in this document, you are NOT
@@ -39,7 +37,7 @@
 
 2) OWNERSHIP
 
-'tsshbatch' Is Copyright (c) 2011-2014 TundraWare Inc. All Rights Reserved.
+'tsshbatch' Is Copyright (c) 2011-2016 TundraWare Inc. All Rights Reserved.
 
 
 3) TERMS
@@ -58,7 +56,7 @@
 
     c) The User acknowledges 'tsshbatch' has NOT been tested for:
 
-       i)   Correct operation 
+       i)   Correct operation
 
        ii)  Freedom from unintended consequences
 
diff --git a/tsshbatch.rst b/tsshbatch.rst
index eb650a1..3195f63 100644
--- a/tsshbatch.rst
+++ b/tsshbatch.rst
@@ -100,7 +100,7 @@
                    ``hostname-`` to the name of each file it saves
                    locally.
 
-  -H hostlistfile  List of hosts on which to run the command.  This should
+  -H hostlist      List of hosts on which to run the command.  This should
                    be enclosed in *quotes* so that the list of hosts
                    is handed to the -H option as a single argument::
 
@@ -149,6 +149,21 @@
 
   -h               Print help information.
 
+  -i hostfile(s)   Specify which files to read to get a list of desired
+                   hosts to target.  This option may be repeated on
+                   the command line and may also be followed with a
+                   quoted list of such files.  The following are
+                   equivalent::
+
+                     tsshbatch.py -i devservers -i uatservers ...
+
+                     tsstbatch.py -i "devservers uatservers" ...
+
+                   The ``-H`` and ``-i`` options can be freely
+                   combined and repated on the command line to create
+                   custom host lists made up of both known inventory
+                   and specific, individual hosts.
+
   -k               Use ssh keys instead of name/password credentials.
 
   -l logfile       Log diagnostic output to ``logfile``. (Default: ``/dev/null``)
@@ -1202,7 +1217,7 @@
 COPYRIGHT AND LICENSING
 -----------------------
 
-**tsshbatch** is Copyright (c) 2011-2014 TundraWare Inc.
+**tsshbatch** is Copyright (c) 2011-2016 TundraWare Inc.
 
 For terms of use, see the ``tsshbatch-license.txt`` file in the
 program distribution.  If you install **tsshbatch** on a FreeBSD