diff --git a/README.md b/README.md
index 75c0fb3..0b13510 100644
--- a/README.md
+++ b/README.md
@@ -138,8 +138,11 @@ directory under `catcli.catalog`.
 
 The `--meta` switch allows to add any additional information to store along in
 the catalog like for example `the blue disk in my office`.
-The `-u --subsize` switch tells catcli to also store (and calculate) the total size
-of each directory. Using the `-a --archive` switch allows to also index archive files as explained
+
+Catcli will calculate and store the total size of each node (directories, storages, etc)
+unless the `-n --no-subsize` switch is used.
+
+Using the `-a --archive` switch allows to also index archive files as explained
 [below](#index-archive-files).
 
 ## Index archive files
@@ -233,7 +236,7 @@ First this directory is indexed with `catcli` as if it was some kind of
 external storage:
 
 ```bash
-$ catcli index --meta='my test directory' --subsize tmptest /tmp/test
+$ catcli index --meta='my test directory' tmptest /tmp/test
 ```
 
 Catcli creates its catalog file in the current directory as `catcli.catalog`.
diff --git a/tests/test_index.py b/tests/test_index.py
index 5ec8bc1..c5396ff 100644
--- a/tests/test_index.py
+++ b/tests/test_index.py
@@ -48,7 +48,7 @@ class TestIndexing(unittest.TestCase):
         tmpdirname = 'tmpdir'
         args = {'<path>': dirpath, '<name>': tmpdirname,
                 '--hash': True, '--meta': ['some meta'],
-                '--subsize': True, '--verbose': True}
+                '--no-subsize': False, '--verbose': True}
 
         # index the directory
         cmd_index(args, noder, catalog, top)
diff --git a/tests/test_update.py b/tests/test_update.py
index b53145a..39eb02c 100644
--- a/tests/test_update.py
+++ b/tests/test_update.py
@@ -49,7 +49,7 @@ class TestIndexing(unittest.TestCase):
         tmpdirname = 'tmpdir'
         args = {'<path>': dirpath, '<name>': tmpdirname,
                 '--hash': True, '--meta': ['some meta'],
-                '--subsize': True, '--verbose': True}
+                '--no-subsize': False, '--verbose': True}
 
         # index the directory
         unix_tree(dirpath)