diff --git a/diceware/__init__.py b/diceware/__init__.py
index 2c15586f6e4ef453d396a3b915dfcc8eded6da2c..b81cb1e508473ac0179d5d8cad8dab54812526cd 100644
--- a/diceware/__init__.py
+++ b/diceware/__init__.py
@@ -80,6 +80,9 @@ def handle_options(args):
     parser.add_argument(
         '-s', '--specials', default=0, type=int, metavar='NUM',
         help="Insert NUM special chars into generated word.")
+    parser.add_argument(
+        '-d', '--delimiter', default='',
+        help="Separate words by DELIMITER. Empty string by default.")
     parser.add_argument(
         'infile', nargs='?', metavar='INFILE', default=None,
         type=argparse.FileType('r'),
diff --git a/tests/exp_help_output.txt b/tests/exp_help_output.txt
index 8495021b812bb6de06f11fd8862db32a3b7deae8..0358e4712494e3084a344a29272c62d1cac710de 100644
--- a/tests/exp_help_output.txt
+++ b/tests/exp_help_output.txt
@@ -1,4 +1,6 @@
-usage: diceware [-h] [-n NUM] [-c | --no-caps] [-s NUM] [--version] [INFILE]
+usage: diceware [-h] [-n NUM] [-c | --no-caps] [-s NUM] [-d DELIMITER]
+                [--version]
+                [INFILE]
 
 Create a passphrase
 
@@ -12,4 +14,6 @@ optional arguments:
   --no-caps             Turn off capitalization.
   -s NUM, --specials NUM
                         Insert NUM special chars into generated word.
+  -d DELIMITER, --delimiter DELIMITER
+                        Separate words by DELIMITER. Empty string by default.
   --version             output version information and exit.