diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index afa25ee..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wlassistant
-# $Id$
-NAME := wlassistant
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/wlassistant.pamd b/wlassistant.pamd
index 8c0e622..c7d67e3 100644
--- a/wlassistant.pamd
+++ b/wlassistant.pamd
@@ -1,8 +1,4 @@
 #%PAM-1.0
-auth       sufficient   pam_rootok.so
-auth       sufficient   pam_timestamp.so
-auth       required     pam_stack.so service=system-auth
-session    required     pam_permit.so
-session    optional     pam_xauth.so
-session    optional     pam_timestamp.so
-account    required     pam_permit.so
+auth		include		config-util
+account		include		config-util
+session		include		config-util
diff --git a/wlassistant.spec b/wlassistant.spec
index 3475280..140c8b8 100644
--- a/wlassistant.spec
+++ b/wlassistant.spec
@@ -1,6 +1,6 @@
 Name:		wlassistant
 Version:	0.5.7
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Summary:	Wireless network management tool
@@ -14,7 +14,7 @@ BuildRequires:	kdebase-devel, desktop-file-utils, wireless-tools-devel, scons
 BuildRequires:	qt-devel, gettext
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
-Requires:       usermode, wireless-tools, net-tools, dhclient
+Requires:       usermode, wireless-tools, net-tools, dhclient, pam
 Patch0:		wlassistant-0.5.5-rpath.patch
 Patch1:		wlassistant-0.5.7-fd_cloexec.patch
 
@@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png
 
 %changelog
+* Sat Nov 17 2007 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.7-5
+- fix pam file to use console-apps pam tree, instead of its own
+  resolves 243240, 306041
+
 * Mon Aug 27 2007 Tom "spot" Callaway <tcallawa@redhat.com> 0.5.7-4
 - rebuild for ppc32
 - license tag fix