diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 3b0ef6d..579a9e3 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,5 +1,17 @@
 # django-watson changelog
 
+## 1.5.0 - 21/12/2017
+
+- Added `--slim` option to `buildwatson` command. This only includes
+  objects which satisfy the filter specified during model registration
+  (Dustin Broderick).
+- Added `--batch-size` option to `buildwatson` command. This controls the
+  batch size for bulk-inserting search entries (Dustin Broderick).
+- Added `--non-atomic` option to `buildwatson` command. This removes the
+  transaction wrapper from `buildwatson`, which can prevent timeouts on
+  huge datasets for some server setups.
+
+
 ## 1.4.4 - 27/11/2017
 
 - Fixed stringifying objects in Python 3 (@danielquinn).
diff --git a/watson/management/commands/buildwatson.py b/watson/management/commands/buildwatson.py
index e1c6da9..f5a6e98 100644
--- a/watson/management/commands/buildwatson.py
+++ b/watson/management/commands/buildwatson.py
@@ -93,14 +93,14 @@ class Command(BaseCommand):
             changes or the index will be incomplete."
         )
         parser.add_argument(
-            '--non_atomic',
+            '--non-atomic',
             action='store_true',
             default=False,
             help="Commit index entries in batches. WARNING: if buildwatson failse, \
             the index will be incomplete."
         )
         parser.add_argument(
-            '--batch_size',
+            '--batch-size',
             action='store',
             default=100,
             type=int,