diff --git a/pam.spec b/pam.spec
index 9e11977..f481159 100644
--- a/pam.spec
+++ b/pam.spec
@@ -109,7 +109,9 @@ BuildRequires:  gettext-devel
 BuildRequires:  pkgconfig(libtirpc)
 BuildRequires:  db-devel
 BuildRequires:  html2text
-BuildRequires:  docbook-dtd-xml
+BuildRequires:  docbook-dtd412-xml
+BuildRequires:  docbook-dtd43-xml
+BuildRequires:  docbook-dtd44-xml
 BuildRequires:  docbook-style-xsl
 BuildRequires:  xsltproc
 %if %{with prelude}
@@ -293,6 +295,8 @@ autoreconf -i
 %endif
 %if %{with selinux}
         --enable-selinux \
+%else
+        --disable-selinux \
 %endif
         --enable-audit 
 %make
@@ -343,11 +347,12 @@ cp -f %{buildroot}/etc/pam.d/system-auth %{buildroot}/etc/pam.d/system-auth-defa
 %find_lang Linux-PAM
 
 %check
+EXCEPT=''
 %if %{without selinux}
-    EXCEPT="--hide=pam_selinux.*"
+    EXCEPT='--hide=pam_selinux.*'
 %endif
 for dir in modules/pam_* ; do
-    if ! ls -1 $EXCEPT %{buildroot}/%{_lib}/security/`basename ${dir}`*.so ; then
+    if ! ls -1 `echo $(EXCEPT)` %{buildroot}/%{_lib}/security/`basename ${dir}`*.so ; then
         echo ERROR `basename ${dir}` did not build a module.
         exit 1
     fi