diff --git a/.drone.yml b/.drone.yml
index b377912e..77d9505b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,22 +1,5 @@
 ---
 kind: pipeline
-name: documentation
-
-steps:
-- name: build
-  image: plugins/docker
-  settings:
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-    repo: witten/borgmatic-docs
-    dockerfile: docs/Dockerfile
-  when:
-    branch:
-      - master
----
-kind: pipeline
 name: python-3-5-alpine-3-9
 
 steps:
@@ -55,3 +38,20 @@ steps:
   pull: always
   commands:
     - scripts/run-tests
+---
+kind: pipeline
+name: documentation
+
+steps:
+- name: build
+  image: plugins/docker
+  settings:
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    repo: witten/borgmatic-docs
+    dockerfile: docs/Dockerfile
+  when:
+    branch:
+      - master
diff --git a/NEWS b/NEWS
index 4b4c2d83..492c8631 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
  * Add Borg/borgmatic hosting providers section to documentation.
  * Add files for building documentation into a Docker image for web serving.
  * Upgrade project build server from Drone 0.8 to 1.1.
+ * Build borgmatic documentation during continuous integration.
 
 1.3.5
  * #153: Support for various Borg directory environment variables (BORG_CONFIG_DIR, BORG_CACHE_DIR,
diff --git a/scripts/dev-docs b/scripts/dev-docs
new file mode 100755
index 00000000..817c2191
--- /dev/null
+++ b/scripts/dev-docs
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+docker build --tag borgmatic-docs --file docs/Dockerfile .
+docker run --interactive --tty --publish 8080:80 --rm borgmatic-docs
diff --git a/scripts/docs/build b/scripts/docs/build
deleted file mode 100755
index d34c8a20..00000000
--- a/scripts/docs/build
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-docker build --tag witten/borgmatic-docs --file docs/Dockerfile .
diff --git a/scripts/docs/push b/scripts/docs/push
deleted file mode 100755
index a60dfbe7..00000000
--- a/scripts/docs/push
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. scripts/docs/build
-docker push witten/borgmatic-docs