diff --git a/CHANGELOG.md b/CHANGELOG.md
index 900c980c..1797faf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ Release history for s390-tools (MIT version)
 
 * __v2.1.1 (2017-mm-dd)__
 
+  Bug Fixes:
+  - lsluns: Do not scan (all) if filters match nothing
+  - lsluns: Enhance usage statement and man page
+
 * __v2.1.0 (2017-09-25)__
 
   Added new tools:
diff --git a/README.md b/README.md
index 133c8bdd..6697d249 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,8 @@ Package contents
    - lsscm:      List information about available Storage Class Memory
                  Increments.
    - chchp:      Modify channel-path state.
-   - lsluns:     List available SCSI LUNs depending on adapter or port.
+   - lsluns:     List LUNs discovered in the FC SAN,
+                 or show encryption state of attached LUNs.
    - lszcrypt:   Show Information about zcrypt devices and configuration.
    - chzcrypt:   Modify the zcrypt configuration.
    - znetconf:   List and configure network devices for s390 network adapters.
@@ -287,9 +288,9 @@ the different tools are provided:
   http://net-snmp.sourceforge.net
 
 * lsluns:
-  For executing the lsluns script the sg_luns command must be available.
-  The sg_luns executable is part of the SCSI generic device driver package
-  (sg3 utils/sg utils).
+  For executing the lsluns script the sg_luns and sg_inq commands must
+  be available. The sg_luns and sg_inq executables are part of the
+  SCSI generic device driver package (sg3 utils/sg utils).
 
 * ziomon tools:
   For running the ziomon tools the following tools/packages are required: