diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..15025dbfbb88d42e8d7d4b89a602b056e85b9688
--- /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-tdfx'
+  # 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-29.0'
+  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto xorg-server-devel pixman libpciaccess libdrm'
+
+
+#
+# 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-tdfx
+  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.md b/README.md
index 8612e7d02a230ce76a89bc74c0d6708d22c58f20..a7296c0ec90e211760804a01260b17eaf0315ac5 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Xorg mailing list:
 
   https://lists.x.org/mailman/listinfo/xorg
 
-The master development code repository can be found at:
+The primary development code repository can be found at:
 
   https://gitlab.freedesktop.org/xorg/driver/xf86-video-tdfx
 
diff --git a/configure.ac b/configure.ac
index 4fe0d1b2e71a3de2243137df151c112cf1c6bce3..15eee7df045d00b288a736c189454d7b1d45d873 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/tdfx.h b/src/tdfx.h
index 7411208309ef8d47db3257d51a1b8a75c587e4d6..ed9e5467b7c4618259ab42711fd2a2fc706b8429 100644
--- a/src/tdfx.h
+++ b/src/tdfx.h
@@ -37,7 +37,7 @@
 #define TDFX_MINOR_VERSION PACKAGE_VERSION_MINOR
 #define TDFX_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
 
-/* Macros to aid source compatibilty between pci-rework and "classic" builds.
+/* Macros to aid source compatibility between pci-rework and "classic" builds.
  */
 #ifdef XSERVER_LIBPCIACCESS
 #include <pciaccess.h>
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
index 90bc56a38d8fc4d3ec2f94dddb14258af8579073..9a58cbaa9039a374f79c7cd0c9fe97b4c50efb9f 100644
--- a/src/tdfx_driver.c
+++ b/src/tdfx_driver.c
@@ -2419,7 +2419,7 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
   pScreen->BlockHandler = TDFXBlockHandler;
 
   /*
-   * DRICloseScreen isn't called thru a wrapper but explicitely
+   * DRICloseScreen isn't called thru a wrapper but explicitly
    * in of TDFXCloseScreen() before the rest is unwrapped
    */
   
diff --git a/src/tdfx_sli.c b/src/tdfx_sli.c
index 1507515ce56c07cd9278e0ef9a24ade9e5ed29dc..88fc0535b75bce793444062f12af09184174a705 100644
--- a/src/tdfx_sli.c
+++ b/src/tdfx_sli.c
@@ -249,7 +249,7 @@ Bool TDFXSetupSLI(ScrnInfoPtr pScrn, Bool sliEnable, int aaSamples)
     else dwFormat = CFG_AA_LFB_RD_FORMAT_32BPP;
     if (pTDFX->numChips==2 && !sliEnable && aaSamples==2)
       dwFormat|=CFG_AA_LFB_RD_DIVIDE_BY_4;
-    /* Thess are wrong, because we don't know where the secondary buffers
+    /* These are wrong, because we don't know where the secondary buffers
        are located */
     pTDFX->writeChipLong(pTDFX, i, CFG_AA_LFB_CTRL, 
 			 (pScrn->videoRam<<10 /* 2nd buf */ << CFG_AA_BASEADDR_SHIFT) |
diff --git a/src/tdfx_video.c b/src/tdfx_video.c
index 46218c1fb070458597893c128bebb03cd520efe7..bcdd3a4ad256084d991403567c1f66563a2b7041 100644
--- a/src/tdfx_video.c
+++ b/src/tdfx_video.c
@@ -528,7 +528,7 @@ TDFXScreenToScreenYUVStretchBlit (ScrnInfoPtr pScrn,
                                   short dst_x2, short dst_y2)
 {
    TDFXPtr pTDFX = TDFXPTR(pScrn);
-   /* reformulate the paramaters the way the hardware wants them */
+   /* reformulate the parameters the way the hardware wants them */
    INT32 src_x = src_x1 & 0x1FFF;
    INT32 src_y = src_y1 & 0x1FFF;
    INT32 dst_x = dst_x1 & 0x1FFF;