diff --git a/doc/source/configspec.rst b/doc/source/configspec.rst
index 5f5be135c..f27e75b35 100644
--- a/doc/source/configspec.rst
+++ b/doc/source/configspec.rst
@@ -223,7 +223,7 @@ The [keybindings] section
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 keybindings for :command:`ikhal` are set here. You can bind more than one key
-(combination) to a command by supplying a comma-seperated list of keys.
+(combination) to a command by supplying a comma-separated list of keys.
 For binding key combinations just add concatenate them (with a space in
 between), e.g. **ctrl n**.
 
diff --git a/khal/configwizard.py b/khal/configwizard.py
index 04ff673a4..0aaf61094 100644
--- a/khal/configwizard.py
+++ b/khal/configwizard.py
@@ -52,20 +52,20 @@ def choose_datetime_format():
             ('day month year', ['%d', '%m', '%Y']),
             ('month day year', ['%m', '%d', '%Y']),
         ]
-        seperator_choices = ['-', '.', '/']
+        separator_choices = ['-', '.', '/']
         validate = partial(validate_int, min_value=0, max_value=2)
 
         print("What ordering of year, month, date do you want to use? "
-              "(You can choose the seperator in the next step)")
+              "(You can choose the separator in the next step)")
         print('\n'.join(
             ['[{}] {}'.format(num, one) for num, (one, _) in enumerate(ordering_choices)]))
         ordering_no = prompt("Please choose one of the above options", value_proc=validate)
         print()
-        print("Now, please choose a seperator")
-        print('\n'.join(['[{}] {}'.format(num, one) for num, one in enumerate(seperator_choices)]))
+        print("Now, please choose a separator")
+        print('\n'.join(['[{}] {}'.format(num, one) for num, one in enumerate(separator_choices)]))
         prompt_text = "Please choose one of the above options"
-        seperator = seperator_choices[prompt(prompt_text, value_proc=validate)]
-        dateformat = seperator.join(ordering_choices[ordering_no][1])
+        separator = separator_choices[prompt(prompt_text, value_proc=validate)]
+        dateformat = separator.join(ordering_choices[ordering_no][1])
         today = date.today()
         text = ("Does this look sensible to you: {} "
                 "(today as an example: {})?".format(dateformat, today.strftime(dateformat)))
diff --git a/khal/settings/khal.spec b/khal/settings/khal.spec
index 929c4794a..ce8a49e7f 100644
--- a/khal/settings/khal.spec
+++ b/khal/settings/khal.spec
@@ -97,7 +97,7 @@ longdatetimeformat = string(default='%d.%m.%Y %H:%M')
 weeknumbers = weeknumbers(default='off')
 
 # keybindings for :command:`ikhal` are set here. You can bind more than one key
-# (combination) to a command by supplying a comma-seperated list of keys.
+# (combination) to a command by supplying a comma-separated list of keys.
 # For binding key combinations just add concatenate them (with a space in
 # between), e.g. **ctrl n**.
 [keybindings]
diff --git a/tox.ini b/tox.ini
index cb6c07354..9ccfa5e72 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,8 +30,11 @@ setenv =
 
 [testenv:py-style]
 skip_install=True
+whitelist_externals = sh
 deps = flake8
-commands = flake8
+commands =
+    flake8
+    sh -c '! grep -ri seperat */*'
 
 [flake8]
 max-line-length = 100