diff --git a/quagga.spec b/quagga.spec
index c9fe4e8..9f6463e 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -32,7 +32,7 @@
 Summary:    Routing daemon
 Name:		quagga
 Version:	0.99.16
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:	GPLv2+
 Group:      System Environment/Daemons
 Source0:    http://www.quagga.net/download/%{name}-%{version}.tar.gz
@@ -50,12 +50,18 @@ Requires:	net-snmp
 BuildRequires:	readline readline-devel ncurses ncurses-devel
 Requires:	ncurses
 %endif
-BuildRequires:	texinfo tetex autoconf pam-devel patch libcap-devel texi2html
+BuildRequires:	texinfo tetex autoconf patch libcap-devel texi2html
+
+%if %with_pam
+BuildRequires:  pam-devel
+Requires:       pam
+%endif
+
 %define __perl_requires %{SOURCE1}
 
 # Initscripts > 5.60 is required for IPv6 support
 Requires:	initscripts >= 5.60
-Requires:	ncurses pam
+Requires:	ncurses
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Provides:	routingdaemon = %{version}-%{release}
@@ -164,8 +170,11 @@ popd
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d,pam.d} \
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d} \
 	$RPM_BUILD_ROOT/var/log/quagga $RPM_BUILD_ROOT%{_infodir}
+%if %with_pam
+install -d $RPM_BUILD_ROOT/etc/$RPM_BUILD_ROOT/etc/pam.d
+%endif
 
 make install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -182,7 +191,9 @@ install %{zeb_rh_src}/ripngd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ripngd
 install %{zeb_rh_src}/ospfd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd
 install %{zeb_rh_src}/ripd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd
 install -m644 %{zeb_rh_src}/quagga.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/quagga
+%if %with_pam
 install -m644 %{zeb_rh_src}/quagga.pam $RPM_BUILD_ROOT/etc/pam.d/quagga
+%endif
 install -m644 %{zeb_rh_src}/quagga.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/quagga
 install -d -m770  $RPM_BUILD_ROOT/var/run/quagga
 
@@ -324,7 +335,9 @@ rm -rf $RPM_BUILD_ROOT
 # noreplace not used due to smaple conf files
 %config /etc/quagga/[!v]*
 %attr(755,root,root) /etc/rc.d/init.d/*
+%if %with_pam
 %config(noreplace) /etc/pam.d/quagga
+%endif
 %config(noreplace) %attr(640,root,root) /etc/logrotate.d/quagga
 %config(noreplace) /etc/sysconfig/quagga                  
 
@@ -348,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Jun 11 2010 Jiri Skala <jskala@redhat.com> - 0.99.16-2
+- pam.d is disabled
+
 * Wed Mar 17 2010 Jiri Skala <jskala@redhat.com> - 0.99.16-1
 - latest upstream version
 - merged initscript patches