diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a64e805cd30266655b8a08ec931f2ceb97b7e13d..878a2ff5f3298a2482dd0c60579b6542dbddd922 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ stages:
   - build
   - full-build
   - cleanup # See Note [Cleanup on Windows]
+  - packaging
 
 ############################################################
 # Runner Tags
@@ -535,3 +536,28 @@ cleanup-darwin:
     - rm -Rf $BUILD_DIR/*
     - exit 0
 
+############################################################
+# Packaging
+############################################################
+
+doc-tarball:
+  stage: packaging
+  tags:
+    - x86_64-linux
+  image: ghcci/x86_64-linux-deb9:0.2
+  dependencies:
+    - validate-x86_64-linux-deb9
+    - validate-x86_64-windows
+  artifacts:
+    paths:
+      - haddock.html.tar.xz
+      - libraries.html.tar.xz
+      - users_guide.html.tar.xz
+      - index.html
+      - "*.pdf"
+  script:
+    - rm -Rf docs
+    - distrib/mkDocs/mkDocs ghc-x86_64-deb9-linux.tar.xz ghc-x86_64-mingw32.tar.xz
+    - ls -lh
+    - mv docs/*.tar.xz .
+