diff --git a/gdm-tmpfiles.conf b/gdm-tmpfiles.conf
new file mode 100644
index 0000000..9dac49d
--- /dev/null
+++ b/gdm-tmpfiles.conf
@@ -0,0 +1,7 @@
+# These directories should be automatically created by systemd-tmpfiles(8) during boot
+d /run/gdm 0711 root gdm - -
+d /var/lib/gdm 1770 gdm gdm - -
+d /var/lib/gdm/.config 0700 gdm gdm - -
+d /var/lib/gdm/.config/pulse 0700 gdm gdm - -
+d /var/log/gdm 0755 root root - -
+
diff --git a/gdm.spec b/gdm.spec
index 8018a17..7afc86b 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -11,13 +11,14 @@
 Name: gdm
 Epoch: 1
 Version: 40.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 Summary: The GNOME Display Manager
 
 License: GPLv2+
 URL: https://wiki.gnome.org/Projects/GDM
 Source0: http://download.gnome.org/sources/gdm/40/gdm-%{tarball_version}.tar.xz
 Source1: org.gnome.login-screen.gschema.override
+Source2: gdm-tmpfiles.conf
 
 # moved here from pulseaudio-gdm-hooks-11.1-16
 Source5: default.pa-for-gdm
@@ -182,6 +183,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/gdm/PostSession
 
 %meson_install
 
+install -p -m644 -D %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 install -p -m644 -D %{SOURCE5} %{buildroot}%{_localstatedir}/lib/gdm/.config/pulse/default.pa
 
 rm -f %{buildroot}%{_sysconfdir}/pam.d/gdm
@@ -333,6 +335,7 @@ dconf update || :
 %{_unitdir}/gdm.service
 %dir %{_userunitdir}/gnome-session@gnome-login.target.d/
 %{_userunitdir}/gnome-session@gnome-login.target.d/session.conf
+%{_tmpfilesdir}/%{name}.conf
 
 %files devel
 %dir %{_includedir}/gdm
@@ -347,6 +350,10 @@ dconf update || :
 %{_libdir}/pkgconfig/gdm-pam-extensions.pc
 
 %changelog
+* Wed Jan 18 2023 Ray Strode <rstrode@redhat.com> - 40.1-20
+- Ensure /run/gdm and other gdm directories are created at boot up
+  Resolves: #2047942
+
 * Wed Jan 11 2023 Ray Strode <rstrode@redhat.com> - 40.1-19
 - Re-enable Wayland on aspeed
   Resolves: #2131203