diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3d00503367cf4a3a4760ea0b50f819effa51ea0e
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,98 @@
+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
+#
+# This CI uses the freedesktop.org ci-templates.
+# Please see the ci-templates documentation for details:
+# https://freedesktop.pages.freedesktop.org/ci-templates/
+
+.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+
+
+include:
+  # Arch container builder template
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/arch.yml'
+  - project: 'freedesktop/ci-templates'
+    ref: *template_sha
+    file: '/templates/ci-fairy.yml'
+  - template: Security/SAST.gitlab-ci.yml
+
+
+stages:
+  - prep             # prep work like rebuilding the container images if there is a change
+  - build            # for actually building and testing things in a container
+  - test
+  - deploy
+
+
+variables:
+  FDO_UPSTREAM_REPO: 'xorg/driver/xf86-video-voodoo'
+  # The tag should be updated each time the list of packages is updated.
+  # Changing a tag forces the associated image to be rebuilt.
+  # Note: the tag has no meaning, we use a date format purely for readability
+  FDO_DISTRIBUTION_TAG:  '2022-01-30.0'
+  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto xorg-server-devel pixman libpciaccess'
+
+
+#
+# Verify that commit messages are as expected, signed-off, etc.
+#
+check-commits:
+  extends:
+    - .fdo.ci-fairy
+  stage: prep
+  script:
+    - ci-fairy check-commits --signed-off-by --junit-xml=results.xml
+  except:
+    - master@xorg/driver/xf86-video-voodoo
+  variables:
+    GIT_DEPTH: 100
+  artifacts:
+    reports:
+      junit: results.xml
+
+#
+# Verify that the merge request has the allow-collaboration checkbox ticked
+#
+check-merge-request:
+  extends:
+    - .fdo.ci-fairy
+  stage: deploy
+  script:
+    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
+  artifacts:
+    when: on_failure
+    reports:
+      junit: results.xml
+  allow_failure: true
+
+
+#
+# Build a container with the given tag and the packages pre-installed.
+# This only happens if the tag changes, otherwise the existing image is
+# re-used.
+#
+container-prep:
+  extends:
+    - .fdo.container-build@arch
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+
+
+#
+# The default build, runs on the image built above.
+#
+build:
+  stage: build
+  extends:
+    - .fdo.distribution-image@arch
+  script:
+    - autoreconf -ivf
+    - mkdir _builddir
+    - pushd _builddir > /dev/null
+    - ../configure --disable-silent-rules
+    - make
+    - make check
+    - make distcheck
+    - popd > /dev/null
diff --git a/README b/README
index 0eb0b9073f97ca99d2a00040439e9f3674a10f22..f23423b494b7c4cf15764416939c8de79a752805 100644
--- a/README
+++ b/README
@@ -45,7 +45,7 @@ Voodoo2 and later
 	CPU to screen blit
 	Ultra fast fill to some alignments
 	Monochrome to colour expansion (cpu to screen only)
-	(and they finally made the 2D and 3D state independant
+	(and they finally made the 2D and 3D state independent
 	 if someone ever gets drunk enough to do DRI...)
 	Colour conversion on blit
 	Dither
diff --git a/configure.ac b/configure.ac
index e8ba16abb43f3e2a7466b3328bd62828ea72fc70..c9ce251290fe2b70cd6921821bd80490f6b7976f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
 
 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index edcde475927b20def66054111ca4e1dc7a64dfcf..dda72a4e070a68f91e71105d197ba11c7b8bdaad 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -5,7 +5,7 @@
  * accelerations that Glide does not expose.  The Voodoo 2 hardware has
  * bit blit (screen->screen, cpu->screen), some colour expansion and 
  * also alpha (so could do hw render even!). Also can in theory use
- * texture ram and engine to do arbitary Xv support as we have
+ * texture ram and engine to do arbitrary Xv support as we have
  * colour match on the 2D blit (ie 3D blit to back, 2D blit to front)
  * along with alpha on the Xv 8) and with some care rotation of Xv.
  * 
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index 6ef12aede3eb30c61497dc5e11715e5082f7b7c8..5584a53454bf74a4cfa0949a6b208b49ddb30317 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -5,7 +5,7 @@
  * accelerations that Glide does not expose.  The Voodoo 2 hardware has
  * bit blit (screen->screen, cpu->screen), some colour expansion and 
  * also alpha (so could do hw render even!). Also can in theory use
- * texture ram and engine to do arbitary Xv support as we have
+ * texture ram and engine to do arbitrary Xv support as we have
  * colour match on the 2D blit (ie 3D blit to back, 2D blit to front)
  * along with alpha on the Xv 8) and with some care rotation of Xv.
  * 
@@ -99,7 +99,7 @@ static void	VoodooDisplayPowerManagementSet(ScrnInfoPtr pScrn,
 /* 
  * This contains the functions needed by the server after loading the
  * driver module.  It must be supplied, and gets added the driver list by
- * the Module Setup funtion in the dynamic case.  In the static case a
+ * the Module Setup function in the dynamic case.  In the static case a
  * reference to this is compiled in, and this requires that the name of
  * this DriverRec be an upper-case version of the driver name.
  */
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index 5a854468176ee7fefb06fc4424cc4eaf3b1a3093..59ee59b6b13077c61155a9b250e1c3d7cadeb6cc 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -120,7 +120,7 @@ static void mmio32_w_chuck(VoodooPtr pVoo, int reg, CARD32 val)
 }
 
 /*
- *	Size the video RAM. Texture ram sizing is different and seperate
+ *	Size the video RAM. Texture ram sizing is different and separate
  *	but we don't use the texture ram for 2D anyway.
  */
  
@@ -785,7 +785,7 @@ void VoodooClear(VoodooPtr pVoo)
 	
 	mmio32_w(pVoo, 0x118, pVoo->Width);
 	mmio32_w(pVoo, 0x11C, pVoo->Height << 16);
-	/* On entry we know Clip is set correctly so we wil clear the lot */
+	/* On entry we know Clip is set correctly so we will clear the lot */
 	mmio32_w(pVoo, 0x148, 0xC0C0C0);	/* RGB888 black */
 	mmio32_w(pVoo, 0x130, 0xFFFF);	/* I think ?? */
 	/* We want to write to screen and depth, front buffer, and no dither */
@@ -805,7 +805,7 @@ void VoodooClear(VoodooPtr pVoo)
  *
  *	There are two banks. Bank 0 is the front buffer, bank 1 is the
  *	back buffer. We don't use the aux buffer. Additionally the
- *	back bufer in 1024x768 with 2Mbyte cards is only a partial buffer.
+ *	back buffer in 1024x768 with 2Mbyte cards is only a partial buffer.
  *	(No SLI yet)
  *
  *	Not yet used (TODO: figure out the offsets for the backbuffer layout)
@@ -959,7 +959,7 @@ static void Voodoo2SubsequentScreenToScreenCopy(ScrnInfoPtr pScrn,
 {
 	VoodooPtr pVoo = VoodooPTR(pScrn);
 	wait_idle(pVoo);
-	/* Adjust co-ordinates for backward blits */
+	/* Adjust coordinates for backward blits */
 	height --;	/* Adjust for fenceposting in the hardware */
 	width --;
 	if(pVoo->BlitDirY < 0)