diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 3f31535..731779e 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   13.%{gitdate}%{?dist}
+Release:   14.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -36,6 +36,8 @@ Source0:   http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
 Source1:   gitignore
 %endif
 
+Source10:   xserver.pamd
+
 # "useful" xvfb-run script
 Source20:  http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
 
@@ -328,7 +330,6 @@ git am -p1 %{lua: for i, p in ipairs(patches) do print(p.." ") end}
 %define dri_flags --disable-dri
 %endif
 
-# --with-rgb-path should be superfluous now ?
 # --with-pie ?
 autoreconf -v --install || exit 1
 export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
@@ -354,11 +355,12 @@ make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir}
 %if %{with_hw_servers}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
 
-# Install the vesamodes and extramodes files to let our install/config tools
-# be able to parse the same modelist as the X server uses (rhpxl).
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
 install -m 0444 hw/xfree86/common/{vesa,extra}modes $RPM_BUILD_ROOT%{_datadir}/xorg/
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver
+
 %endif
 
 # Make the source package
@@ -406,6 +408,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with_hw_servers}
 %files Xorg
 %defattr(-,root,root,-)
+%config %attr(0644,root,root) %{_sysconfdir}/pam.d/xserver
 %{_bindir}/X
 %attr(4711, root, root) %{_bindir}/Xorg
 %{_bindir}/cvt
@@ -518,6 +521,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 15 2009 Adam Jackson <ajax@redhat.com> 1.6.99-14.20090715
+- Move PAM config file here from xdm.
+
 * Wed Jul 15 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.99-13.20090715
 - Today's git snapshot.
 
diff --git a/xserver.pamd b/xserver.pamd
new file mode 100644
index 0000000..bf79930
--- /dev/null
+++ b/xserver.pamd
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       sufficient	pam_rootok.so
+auth       required	pam_console.so
+account    required	pam_permit.so
+session    optional	pam_keyinit.so force revoke