diff --git a/data/bitmaps/ChangeLog b/data/bitmaps/ChangeLog
index b6eb337a8..98407e32d 100644
--- a/data/bitmaps/ChangeLog
+++ b/data/bitmaps/ChangeLog
@@ -1,3 +1,62 @@
+commit aed8d7ced841f9c5af757bf24e5488828d5c77e6
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Thu Feb 23 09:04:47 2023 -0800
+
+    xbitmaps 1.1.3
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3245526ace9e0525b7b6c77b60446673c178a2f6
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Feb 15 12:47:22 2023 -0800
+
+    Switch to XORG_DEFAULT_NOCODE_OPTIONS
+    
+    Stop running all sorts of compiler tests we don't need since there
+    is no code in this module to compile.  Requires xorg-macros 1.20.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 99145beca020d2d5dac8d27ed18013b2f57727ec
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Thu Jul 28 17:30:21 2022 -0700
+
+    gitlab CI: stop requiring Signed-off-by in commits
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 4b773145753cf1f2069fee9c9f505ded1abadb6a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Dec 7 16:51:26 2021 -0800
+
+    Build xz tarballs instead of bzip2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f9a45fa5bdeffcdf6e32d556abb74a9b39227961
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Thu Dec 2 17:30:19 2021 -0800
+
+    gitlab CI: add a basic build test
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 76bb0405b2b291204e5dacc71fa8dc049464928f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Nov 25 12:40:34 2018 -0800
+
+    Update configure.ac bug URL for gitlab migration
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 089dbde684d6b9a109ca18e865edaa1952f16dfb
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Nov 16 23:36:02 2018 -0800
+
+    Update README for gitlab migration
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit 61eebdfde170841ae933cf65ba27346fbf2f8018
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Mar 9 22:36:07 2018 -0800
@@ -309,7 +368,7 @@ Date:   Fri Jul 29 21:22:39 2005 +0000
     - Update modular Xorg version
 
 commit e064819df8ea9f09c925772056aa441cd36d7aab
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Fri Jul 15 16:43:19 2005 +0000
 
     Build system for bitmaps
diff --git a/data/bitmaps/Makefile.am b/data/bitmaps/Makefile.am
index 060112d66..93f83a5a7 100644
--- a/data/bitmaps/Makefile.am
+++ b/data/bitmaps/Makefile.am
@@ -88,3 +88,5 @@ ChangeLog:
 	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog INSTALL
+
+EXTRA_DIST = README.md
diff --git a/data/bitmaps/README.md b/data/bitmaps/README.md
new file mode 100644
index 000000000..32dc3a6b6
--- /dev/null
+++ b/data/bitmaps/README.md
@@ -0,0 +1,18 @@
+This package contains bitmaps commonly used in X.Org applications.
+The bitmaps are in the X BitMap (XBM) format.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+  https://lists.x.org/mailman/listinfo/xorg
+
+The primary development code repository can be found at:
+
+  https://gitlab.freedesktop.org/xorg/data/bitmaps
+
+Please submit bug reports and requests to merge patches there.
+
+For patch submission instructions, see:
+
+  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
diff --git a/data/bitmaps/configure.ac b/data/bitmaps/configure.ac
index 4a72beed3..7b2c70fe2 100644
--- a/data/bitmaps/configure.ac
+++ b/data/bitmaps/configure.ac
@@ -2,19 +2,19 @@ dnl Process this file with autoconf to create configure.
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xbitmaps], [1.1.2],
-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xbitmaps])
+AC_INIT([xbitmaps], [1.1.3],
+        [https://gitlab.freedesktop.org/xorg/data/bitmaps/-/issues], [xbitmaps])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
 
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require xorg-macros 1.20 or later: XORG_DEFAULT_NOCODE_OPTIONS
 m4_ifndef([XORG_MACROS_VERSION],
-	  [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-XORG_DEFAULT_OPTIONS
+	  [m4_fatal([must install xorg-macros 1.20 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.20)
+XORG_DEFAULT_NOCODE_OPTIONS
 
 AC_CONFIG_FILES([Makefile
 		xbitmaps.pc