diff --git a/lib/do_images.js b/lib/do_images.js
index 5c92151..1f17eb7 100644
--- a/lib/do_images.js
+++ b/lib/do_images.js
@@ -132,6 +132,8 @@ do_images.help = (
     'Usage:\n' +
     '    {{name}} images [<options>] [<filters>]\n' +
     '\n' +
+    '{{options}}' +
+    '\n' +
     'Filters:\n' +
     '    FIELD=VALUE        Field equality filter. Supported fields: \n' +
     '                       account, owner, state, name, os, and type.\n' +
@@ -147,9 +149,7 @@ do_images.help = (
     '                       image with a state *other* than "active".\n' +
     '    pubdate            Short form of "published_at" with just the date\n' +
     '    pub                Short form of "published_at" elliding milliseconds.\n' +
-    '    size               The number of bytes of the image file (files.0.size)\n' +
-    '\n' +
-    '{{options}}'
+    '    size               The number of bytes of the image file (files.0.size)\n'
     /* END JSSTYLED */
 );
 
diff --git a/lib/do_packages.js b/lib/do_packages.js
index 1684598..c20cbde 100644
--- a/lib/do_packages.js
+++ b/lib/do_packages.js
@@ -153,24 +153,32 @@ do_packages.options = [
     }
 ]);
 
-do_packages.help = (
+do_packages.help = [
     /* BEGIN JSSTYLED */
-    'List packgaes.\n'
-    + '\n'
-    + 'Usage:\n'
-    + '     {{name}} packages\n'
-    + '\n'
-    + '{{options}}'
-    + '\n'
-    + 'Notes on some fields:\n'
-    + '- The "memory" (a.k.a. RAM), "swap", and "disk" fields are shown in\n'
-    + '  more human readable units in tabular output (i.e. if neither "-p" nor\n'
-    + '  "-j" is specified.\n'
-    + '- The "vcpus" field is only relevant for KVM instances. It is therefore\n'
-    + '  typically set to zero for packages not intended for KVM usage. This\n'
-    + '  zero is shown as "-" in tabular output.\n'
+    'List packgaes.',
+    '',
+    'Usage:',
+    '    {{name}} packages [<filters>]',
+    '',
+    '{{options}}',
+    'Filters:',
+    '    FIELD=VALUE        Field equality filter. Supported fields: ',
+    '                       account, owner, state, name, os, and type.',
+    '    FIELD=true|false   Field boolean filter. Supported fields: public.',
+    '    FIELD=~SUBSTRING   Field substring filter. Supported fields: name',
+    '',
+    'Notes on some fields:',
+    '- The "memory" (a.k.a. RAM), "swap", and "disk" fields are shown in',
+    '  more human readable units in tabular output (i.e. if neither "-p" nor',
+    '  "-j" is specified.',
+    '- The "vcpus" field is only relevant for KVM instances. It is therefore',
+    '  typically set to zero for packages not intended for KVM usage. This',
+    '  zero is shown as "-" in tabular output.',
+    '',
+    'Examples:',
+    '    {{name}} packages memory=8192   # list packages with 8G RAM'
     /* END JSSTYLED */
-);
+].join('\n');
 
 do_packages.aliases = ['pkgs'];