diff --git a/CASA-auth-token/Makefile.am b/CASA-auth-token/Makefile.am
index 148ac731..4a48595d 100644
--- a/CASA-auth-token/Makefile.am
+++ b/CASA-auth-token/Makefile.am
@@ -24,13 +24,12 @@ SUBDIRS = server package
 
 DIST_SUBDIRS = include server package
 
-CFILES =
-
-EXTRA_DIST = $(CFILES)
+#EXTRA_DIST = autogen.sh
+EXTRA_DIST = autogen.sh bandit bandit/commons bandit/commons/* bandit/ia/*
 
 .PHONY: package package-clean package-install package-uninstall
 package package-clean package-install package-uninstall:
-	$(MAKE) -C $(TARGET_OS) $@
+	$(MAKE) -C package $@
 
 clean-local:
 	if [ -d lib ]; then  rm -rf lib; fi
diff --git a/CASA-auth-token/configure.in b/CASA-auth-token/configure.in
index f6b98edf..1c790173 100644
--- a/CASA-auth-token/configure.in
+++ b/CASA-auth-token/configure.in
@@ -19,7 +19,7 @@
 #
 #######################################################################
 
-AC_INIT(client/internal.h)
+AC_INIT(include/casa_s_authtoken.h)
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(CASA-auth-token, 1.7.678)
 RELEASE=`date +%Y%m%d_%H%M`
@@ -262,7 +262,7 @@ AC_OUTPUT([
 Makefile
 package/Makefile
 package/linux/Makefile
-package/linux/CASA-auth-token.spec
+package/linux/CASA-auth-token-service.spec
 include/Makefile
 server/Makefile
 server/AuthTokenValidate/Makefile
diff --git a/CASA-auth-token/package/linux/CASA-auth-token-service.spec.in b/CASA-auth-token/package/linux/CASA-auth-token-service.spec.in
new file mode 100644
index 00000000..086bbb4d
--- /dev/null
+++ b/CASA-auth-token/package/linux/CASA-auth-token-service.spec.in
@@ -0,0 +1,308 @@
+#
+# spec file for the CASA-auth-token packages.
+#
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org
+#
+
+# norootforbuild
+
+# For debug build, please replace Release to Debug and set debug_opt to --enable-debug
+%define cfg Release
+%define debug_opt ""
+                                                                                                                           
+
+Name:          @PACKAGE@ 
+URL:          http://www.novell.com/products
+BuildRequires:  gcc-c++ glib2-devel krb5-devel libgssapi libstdc++-devel pam-devel pkgconfig java-1_5_0-ibm-devel apache2-devel update-alternatives mono-devel CASA-devel servletapi5 
+%define prefix /usr
+License:       LGPL
+Group:         Applications/System
+Autoreqprov:   on
+%define	       bldno	1.0.0
+Version:       @VERSION@ 
+Release:       0
+Summary:       Novell Common Authentication Services Adapter Authentication Token Infrastructure (CASA-auth-token)
+Source:        %{name}-%{version}.tar.bz2
+BuildRoot:     %{_tmppath}/%{name}-%{version}-build
+Requires:      java-1_5_0-ibm servletapi5 tomcat5
+PreReq:        %fillup_prereq %insserv_prereq
+
+%description
+CASA-auth-token is an authentication token infrastructure with support for multiple
+authentication mechanisms with an emphasis on providing a scalable single
+sign-on solution.
+ 
+A key feature of CASA-auth-token is that its authentication tokens contain identity
+information about the entity being authenticated. This information is made available
+to the consuming services. The amount of information contained in the tokens is
+configured on a per-service basis. Because of this feature, we say that CASA-auth-token
+projects an "Authenticated Identity".
+
+The CASA-auth-token-service is the infrastructure component responsible for authenticating
+entities using the native authentication mechanism and for issuing tokens that can later
+be used by applications to authenticate the entity o services that are CASA authentication
+enabled.
+
+%package -n CASA-auth-token-server-support
+Summary:      Libraries needed for "C" applications development.
+Group:        Applications/System
+Requires:     CASA-devel
+
+%description -n CASA-auth-token-server-support
+This package contains the CASA (Common Authentication Services Adapter)
+authentication token infrastructure lower level libraries for token
+verification from native code ("C"). It is recomended that this library
+not be invoked directly by applications, instead it is recomended that
+appplication invoke its services through the support modules provided to
+integrate with PAM or the Apache Web Server.
+ 
+%package -n CASA-auth-token-pam-support
+Summary:      Libraries needed for PAM applications development.
+Group:        Applications/System
+Requires:     CASA-auth-token-server-support pam
+
+%description -n CASA-auth-token-pam-support
+This package contains the CASA (Common Authentication Services Adapter)
+authentication token infrastructure PAM module for token verification.
+ 
+%package -n CASA-auth-token-apache2_2-support
+Summary:      Libraries needed for Apache 2.2 applications development.
+Group:        Applications/System
+Requires:     apache2 CASA-auth-token-server-support
+
+%description -n CASA-auth-token-apache2_2-support
+This package contains the CASA (Common Authentication Services Adapter)
+authentication token infrastructure Apache v2.2 authentication provider
+module for token verification. The module expects that users authenticate
+utilizing the HTTP Basic authentication scheme and that the password utilized consist
+of a CASA authentication token. Information about the authenticated identity is
+made available to other Apache modules via the Apache request environment variable.
+
+%package -n CASA-auth-token-jaas-support
+Summary:      Libraries needed for JAAS applications development.
+Group:        Applications/System
+Requires:     java-1_5_0-ibm
+
+%description -n CASA-auth-token-jaas-support
+This package contains the CASA (Common Authentication Services Adapter)
+authentication token infrastructure JAAS module and supporting libraries
+for token verification.
+
+%package -n CASA-auth-token-devel
+Summary:      Include files needed for applications development.
+Group:        Applications/System
+Requires:     CASA-devel CASA-auth-token-server-support CASA-auth-token-jaas-support CASA-auth-token-pam-support CASA-auth-token-apache2_2-support CASA-auth-token-service
+
+%description -n CASA-auth-token-devel
+This package contains the files necessary for the development of client and
+server applications that utilize the CASA (Common Authentication Service Adapter)
+authentication token infrastructure for authentication.
+
+ 
+%prep
+%setup -q
+#%patch
+%if %{_lib} == "lib64"
+%define binsource bin64
+%else
+%define binsource bin
+%endif
+
+%build
+export PATH=.:$PATH:/usr/%_lib/qt3/bin
+%if %suse_version > 1000
+export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fstack-protector"
+%endif 
+
+./autogen.sh 
+make
+
+
+%install
+
+## Prime the file system ##
+install -d %{buildroot}%{prefix}
+install -d %{buildroot}%{prefix}/%{_lib}
+install -d %{buildroot}%{prefix}/%{_lib}/security
+install -d %{buildroot}%{prefix}/include
+
+## CASA-auth-token-service ##
+# Libs
+install -m 755 %{_lib}/java/CasaAuthTokenSvc.war %{buildroot}%{prefix}/%{_lib}/CasaAuthTokenSvc.war.%{bldno}
+
+# Lib Symbolic Links
+ln -s CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthTokenSvc.war
+ln -s CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthTokenSvc.war.1
+
+## CASA-auth-token-server-support ##
+# Libs
+install -m 755 %{_lib}/%{cfg}/libcasa_s_authtoken.so %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.%{bldno}
+
+# Lib Symbolic Links
+ln -s libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so
+ln -s libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
+
+## CASA-auth-token-pam-support ##
+# Libs
+install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so.%{bldno}
+#install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so
+
+# Lib Symbolic Links
+ln -s pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so
+ln -s pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so.1
+
+## CASA-auth-token-apache2_2-support ##
+# Libs
+install -m 755 %{_lib}/%{cfg}/mod_authn_casa.so %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno}
+
+# Lib Symbolic Linksln -s %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so
+ln -s mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so
+ln -s mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.1
+
+## CASA-auth-token-jaas-support ##
+# Libs
+install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/%{_lib}/CasaJaasSupport.jar.%{bldno}
+install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/%{_lib}/CasaAuthToken.jar.%{bldno}
+
+# Lib Symbolic Links
+ln -s CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaJaasSupport.jar
+ln -s CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaJaasSupport.jar.1
+ln -s CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthToken.jar
+ln -s CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthToken.jar.1
+
+## CASA-auth-token-devel ##
+# Header Files
+install -m 644 include/casa_c_authtoken.h %{buildroot}%{prefix}/include
+install -m 644 include/casa_s_authtoken.h %{buildroot}%{prefix}/include
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+## CASA-auth-token-service ##
+%pre
+# Nothing to do in this pre script
+
+%post
+/sbin/ldconfig
+
+%preun
+# Nothing to do in this preun script
+
+%postun
+# Nothing to do in this postun script
+
+%files
+%defattr(-,root,root)
+%{prefix}/%{_lib}/CasaAuthTokenSvc.war.%{bldno}
+%{prefix}/%{_lib}/CasaAuthTokenSvc.war
+%{prefix}/%{_lib}/CasaAuthTokenSvc.war.1
+
+
+## CASA-auth-token-server-support ##
+%pre -n CASA-auth-token-server-support
+# Nothing to do in this pre script
+
+%post -n CASA-auth-token-server-support
+/sbin/ldconfig
+
+%preun -n CASA-auth-token-server-support
+# Nothing to do in this preun script
+
+%postun -n CASA-auth-token-server-support
+# Nothing to do in this postun script
+
+%files -n CASA-auth-token-server-support
+%defattr(-,root,root)
+%{prefix}/%{_lib}/libcasa_s_authtoken.so.%{bldno}
+%{prefix}/%{_lib}/libcasa_s_authtoken.so
+%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
+
+
+## CASA-auth-token-pam-support ##
+%pre -n CASA-auth-token-pam-support
+# Nothing to do in this pre script
+
+%post -n CASA-auth-token-pam-support
+/sbin/ldconfig
+
+%preun -n CASA-auth-token-pam-support
+# Nothing to do in this preun script
+
+%postun -n CASA-auth-token-pam-support
+# Nothing to do in this postun script
+
+%files -n CASA-auth-token-pam-support
+%defattr(-,root,root)
+%{prefix}/%{_lib}/security/pam_casaauthtok.so.%{bldno}
+%{prefix}/%{_lib}/security/pam_casaauthtok.so
+%{prefix}/%{_lib}/security/pam_casaauthtok.so.1
+
+
+## CASA-auth-token-apache2_2-support ##
+%pre -n CASA-auth-token-apache2_2-support
+# Nothing to do in this pre script
+
+%post -n CASA-auth-token-apache2_2-support
+/sbin/ldconfig
+
+%preun -n CASA-auth-token-apache2_2-support
+# Nothing to do in this preun script
+
+%postun -n CASA-auth-token-apache2_2-support
+# Nothing to do in this postun script
+
+%files -n CASA-auth-token-apache2_2-support
+%defattr(-,root,root)
+%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno}
+%{prefix}/%{_lib}/mod_authn_casa.so
+%{prefix}/%{_lib}/mod_authn_casa.so.1
+
+
+## CASA-auth-token-jaas-support ##
+%pre -n CASA-auth-token-jaas-support
+# Nothing to do in this pre script
+
+%post -n CASA-auth-token-jaas-support
+/sbin/ldconfig
+
+%preun -n CASA-auth-token-jaas-support
+# Nothing to do in this preun script
+
+%postun -n CASA-auth-token-jaas-support
+# Nothing to do in this postun script
+
+%files -n CASA-auth-token-jaas-support
+%defattr(-,root,root)
+%{prefix}/%{_lib}/CasaJaasSupport.jar.%{bldno}
+%{prefix}/%{_lib}/CasaJaasSupport.jar
+%{prefix}/%{_lib}/CasaJaasSupport.jar.1
+%{prefix}/%{_lib}/CasaAuthToken.jar.%{bldno}
+%{prefix}/%{_lib}/CasaAuthToken.jar
+%{prefix}/%{_lib}/CasaAuthToken.jar.1
+
+
+## CASA-auth-token-devel ##
+%pre -n CASA-auth-token-devel
+# Nothing to do in this pre script
+
+%post -n CASA-auth-token-devel
+# Nothing to do in this post script
+
+%preun -n CASA-auth-token-devel
+# Nothing to do in this preun script
+
+%postun -n CASA-auth-token-devel
+# Nothing to do in this postun script
+
+%files -n CASA-auth-token-devel
+%defattr(-,root,root)
+%{prefix}/include/casa_c_authtoken.h
+%{prefix}/include/casa_s_authtoken.h
+
+%changelog -n CASA-auth-token
diff --git a/CASA-auth-token/package/linux/CASA-auth-token.spec.in b/CASA-auth-token/package/linux/CASA-auth-token.spec.in
deleted file mode 100644
index c580497c..00000000
--- a/CASA-auth-token/package/linux/CASA-auth-token.spec.in
+++ /dev/null
@@ -1,341 +0,0 @@
-#
-# spec file for package CASA-auth-token
-#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
-#
-
-# norootforbuild
-
-# For debug build, please replace Release to Debug and set debug_opt to --enable-debug
-%define cfg Release
-%define debug_opt ""
-                                                                                                                           
-
-Name:          @PACKAGE@ 
-URL:          http://www.novell.com/products
-# BuildRequires:  gcc-c++ glade-sharp glib-sharp glib2-devel gnome-filesystem gnome-keyring-devel gtk-sharp gtk-sharp-gapi gtk2-devel java2-devel-packages  mDNSResponder-devel kdelibs3-devel krb5-devel libgssapi libstdc++-devel mono-devel pam-devel pkgconfig qt3-devel
-#BuildRequires:  gcc-c++ glade-sharp glib-sharp glib2-devel gnome-filesystem gtk-sharp gtk-sharp-gapi gtk2-devel java2-devel-packages  mDNSResponder-devel kdelibs3-devel krb5-devel libgssapi libstdc++-devel mono-devel pam-devel pkgconfig qt3-devel
-BuildRequires:  gcc-c++ glib2-devel java2-devel-packages krb5-devel libgssapi libstdc++-devel pam-devel pkgconfig qt3-devel
-%define prefix		/usr/share/doc/packages
-%define bin_prefix	/usr
-License:       LGPL
-Group:         Productivity/Other
-Autoreqprov:   on
-%define	       bldno	1.1.1
-Version:       @VERSION@ 
-Release:       0
-Summary:       Novell Common Authentication Services Adapter Authentication Token Infrastructure (CASA-auth-token)
-Source:        %{name}-%{version}.tar.bz2
-#Patch:	       %{name}-%{version}.diff
-#Patch2:        CASA-detect_lib64.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-build
-Requires:      
-PreReq:        %fillup_prereq %insserv_prereq
-#ExclusiveArch: %ix86 x86_64
-#NoSource:     0
-
-%description
-CASA-auth-token is an authentication token infrastructure with support for multiple
-authentication mechanisms with an emphasis on providing a scalable single
-sign-on solution.
- 
-A key feature of CASA-auth-token is that its authentication tokens contain identity
-information about the entity being authenticated. This information is made available
-to the consuming services. The amount of information contained in the tokens is
-configured on a per-service basis. Because of this feature, we say that CASA-auth-token
-projects an "Authenticated Identity".
-
-
-CASA-auth-token-service.rpm
-
-requires: tomcat, java
-
-AuthTokenSvc-war
-
-CASA-auth-token-native-support.rpm
-
-libserver.so
-
-CASA-auth-token-pam-support.rpm
-
-requires: CASA-auth-token-native-support.rpm pam
-
-pam_module.so
-
-CASA-auth-token-apache2.2-support.rpm
-
-requires: CASA-auth-token-native-support.rpm, apache2.2
-
-apache_mod.so
-
-CASA-auth-token-jaas-support.rpm
-
-requires: java
-
-JaasSupport.jar
-AuthTokenSvc-jar
-
-CASA-auth-token-devel.rpm
-
-requires: CASA-auth-token-native-support.rpm, CASA-auth-token-client.rpm, CASA-auth-token-pam-support.rpm, CASA-auth-token-apache2.2-support.rpm, CASA-auth-token-jaas-support.rpm
-
-client.h
-server.h
-
-%package devel
-Summary:      Include Files and Libraries mandatory for Development.
-Group:        Productivity/Other
-Requires:     CASA-auth-token-native-support, CASA-auth-token-client, CASA-auth-token-pam-support, CASA-auth-token-apache2.2-support, CASA-auth-token-jaas-support
-Provides:     CASA-auth-token-devel
-
-%description devel 
-This package contains all necessary include files and libraries needed
-to develop applications that can use the CASA (Common Authentication
-Service Adapter) authentication token
-infrastructure for authentication.
-
-%package native-support
-Summary:      CASA authentication token "C" libraries for token verification.
-Group:        Productivity/Other
-Requires:
-Provides:     CASA-auth-token-native-support
-
-%description native-support 
-This package contains the CASA (Common Authentication Services Adapter)
-authentication token infrastructure lower level libraries for token
-verification from native code ("C"). It is recomended that this library
-not be invoked directly by applications, instead it is recomended that
-appplication invoke its services through the support modules provided to
-integrate with PAM or the Apache Web Server.
-
-%package pam-support
-Summary:      CASA authentication token PAM module for token verification.
-Group:        Productivity/Other
-Requires:     CASA-auth-token-native-support
-Provides:     CASA-auth-token-pam-support
-
-%description pam-support 
-This package contains the CASA (Common Authentication Services Adapter)
-authentication token infrastructure PAM module for token verification.
-
-%package apache2.2-support
-Summary:      CASA authentication token Apache v2.2 authentication provider module for token verification.
-Group:        Productivity/Other
-Requires:     CASA-auth-token-native-support
-Provides:     CASA-auth-token-apache2.2-support
-
-%description apache2.2-support 
-This package contains the CASA (Common Authentication Services Adapter)
-authentication token infrastructure Apache v2.2 authentication provider
-module for token verification.
-
-%package jaas-support
-Summary:      CASA authentication token PAM module for token verification.
-Group:        Productivity/Other
-Requires:     java
-Provides:     CASA-auth-token-jaas-support
-
-%description jaas-support 
-This package contains the CASA (Common Authentication Services Adapter)
-authentication token infrastructure JAAS module and supporting libraries
-for token verification.
-
-
-%prep
-%setup -q
-#%patch
-%if %{_lib} == "lib64"
-%define binsource bin64
-%else
-%define binsource bin
-%endif
-
-
-%build
-export PATH=.:$PATH:/usr/%_lib/qt3/bin
-%if %suse_version > 1000
-export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fstack-protector"
-%endif 
-
-./autogen.sh 
-make
-
-%install
-
-mkdir -p %{buildroot}%{prefix}
-mkdir -p %{buildroot}%{prefix}/CASA
-mkdir -p %{buildroot}%{bin_prefix}/%{_lib}
-mkdir -p %{buildroot}%{bin_prefix}/bin
-mkdir -p %{buildroot}%{bin_prefix}/sbin
-mkdir -p %{buildroot}%{bin_prefix}/include
-mkdir -p %{buildroot}%{prefix}/CASA/images
-mkdir -p %{buildroot}%{prefix}/CASA/help
-mkdir -p %{buildroot}%{prefix}/CASA/help/en
-mkdir -p %{buildroot}%{prefix}/CASA/doc
-mkdir -p %{buildroot}/%{_lib}/security
-mkdir -p %{buildroot}/etc/init.d
-mkdir -p %{buildroot}/etc/ld.so.conf.d
-
-install -m 755 %{_lib}/%{cfg}/libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}
-install -m 755 %{_lib}/%{cfg}/libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}
-install -m 755 %{_lib}/%{cfg}/libad_ff.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}
-install -m 755 %{_lib}/%{cfg}/libjmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}
-install -m 755 %{_lib}/%{cfg}/Novell.CASA.miCASAWrapper.dll %{buildroot}%{bin_prefix}/%{_lib}
-install -m 755 %{_lib}/%{cfg}/Novell.CASA.Common.dll %{buildroot}%{bin_prefix}/%{_lib}
-install -m 755 %{_lib}/%{cfg}/Novell.CASA.A-D.dll %{buildroot}%{bin_prefix}/%{_lib}
-install -m 755 %{_lib}/%{cfg}/Novell.CASA.CASAPolicy.dll %{buildroot}%{bin_prefix}/%{_lib}
-install -m 755 %{_lib}/%{cfg}/Novell.CASA.DataEngines.GnomeKeyring.dll %{buildroot}%{bin_prefix}/%{_lib}
-install -m 755 %{_lib}/%{cfg}/Novell.CASA.DataEngines.KWallet.dll %{buildroot}%{bin_prefix}/%{_lib}
-install -m 755 %{_lib}/%{cfg}/Novell.CASA.DataEngines.FireFox.dll %{buildroot}%{bin_prefix}/%{_lib}
-
-install -m 755 %{binsource}/%{cfg}/micasad.exe %{buildroot}%{bin_prefix}/bin
-install -m 755 %{binsource}/%{cfg}/micasad-init %{buildroot}%{bin_prefix}/bin
-install -m 755 %{binsource}/%{cfg}/CASAManager.exe %{buildroot}%{bin_prefix}/bin 
-install -m 755 gui/CASAManager.sh %{buildroot}%{bin_prefix}/bin
-install -m 755 gui/CASAManager.exe.config %{buildroot}%{bin_prefix}/bin
-install -m 755 gui/images/* %{buildroot}%{prefix}/CASA/images
-install -m 755 gui/help/en/* %{buildroot}%{prefix}/CASA/help/en
-install -m 755 micasad/startup/micasad %{buildroot}/etc/init.d
-install -m 755 micasad/startup/micasad.sh %{buildroot}%{bin_prefix}/sbin
-install -m 755 micasad/startup/casacfgpam %{buildroot}%{bin_prefix}/sbin
-install -m 755 micasad/startup/casaucfgpam %{buildroot}%{bin_prefix}/sbin
-install -m 755 micasad/startup/installcasa %{buildroot}%{bin_prefix}/sbin
-install -m 755 micasad/startup/uninstallcasa %{buildroot}%{bin_prefix}/sbin
-install -m 755 micasad/startup/iscasaconfiged %{buildroot}%{bin_prefix}/sbin
-
-install -m 755 %{_lib}/%{cfg}/pam_micasa.so %{buildroot}/%{_lib}/security
-
-install -d %{buildroot}%{bin_prefix}/%{_lib}
-install -d %{buildroot}%{bin_prefix}/bin
-install -d %{buildroot}%{bin_prefix}/sbin
-install -d %{buildroot}%{bin_prefix}/include
-install -d %{buildroot}%{prefix}/CASA/doc
-install -d %{buildroot}%{prefix}/CASA/images
-install -d %{buildroot}%{prefix}/CASA/help/en
-install -d %{buildroot}/%{_lib}/security
-install -d %{buildroot}/etc/init.d
-
-#install -m 644 %{buildroot}%{prefix}/%{_lib}/miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib}
-install -m 755 %{_lib}/%{cfg}/miCASA.jar %{buildroot}%{bin_prefix}/%{_lib}
-
-install -m 644 doc/product/CASA_Reference_Guide.pdf %{buildroot}%{prefix}/CASA/doc
-install -m 644 doc/product/License.txt %{buildroot}%{prefix}/CASA/doc
-install -m 644 doc/product/Readme.txt %{buildroot}%{prefix}/CASA/doc
-install -m 644 include/micasa_mgmd.h %{buildroot}%{bin_prefix}/include
-install -m 644 include/micasa_types.h %{buildroot}%{bin_prefix}/include
-
-ln -s libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libmicasa.so
-ln -s libmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libmicasa.so.1
-ln -s libjmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libjmicasa.so
-ln -s libjmicasa.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libjmicasa.so.1
-
-ln -s libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libad_gk.so
-ln -s libad_gk.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libad_gk.so.1
-
-ln -s libad_ff.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libad_ff.so
-ln -s libad_ff.so.%{bldno} %{buildroot}%{bin_prefix}/%{_lib}/libad_ff.so.1
-
-ln -s /etc/init.d/micasad %{buildroot}%{bin_prefix}/sbin/rcmicasad 
-echo "/usr/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf
-
-install -d %{buildroot}/usr/share/applications
-install gui/CASAManager.desktop %{buildroot}/usr/share/applications
-%suse_update_desktop_file -r CASAManager X-SuSE-ControlCenter-Personal
-%post
-%{fillup_and_insserv micasad}
-
-/sbin/ldconfig
-
-%post gui
-/sbin/ldconfig
-
-%preun
-%stop_on_removal micasad
-
-if [ "x$1" = "x0" ]
-then
-	/usr/sbin/casaucfgpam
-fi
-
-
-%postun
-%restart_on_update micasad
-%insserv_cleanup
-/sbin/ldconfig
-
-%postun gui
-/sbin/ldconfig
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%dir %{prefix}/CASA
-%dir %{prefix}/CASA/doc
-%dir %{bin_prefix}/%{_lib}/libmicasa.so.%{bldno}
-%dir %{bin_prefix}/%{_lib}/libmicasa.so
-%dir %{bin_prefix}/%{_lib}/libmicasa.so.1
-%dir %{bin_prefix}/%{_lib}/libjmicasa.so.%{bldno}
-%dir %{bin_prefix}/%{_lib}/libjmicasa.so
-%dir %{bin_prefix}/%{_lib}/libjmicasa.so.1
-%dir %{bin_prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll
-%dir %{bin_prefix}/%{_lib}/Novell.CASA.Common.dll
-
-/etc/init.d/micasad
-/%{_lib}/security/pam_micasa.so
-/etc/ld.so.conf.d/CASA.conf
-
-%{bin_prefix}/sbin/rcmicasad
-%{bin_prefix}/sbin/casacfgpam
-%{bin_prefix}/sbin/casaucfgpam
-%{bin_prefix}/sbin/installcasa
-%{bin_prefix}/sbin/uninstallcasa
-%{bin_prefix}/sbin/iscasaconfiged
-%{bin_prefix}/sbin/micasad.sh
-
-%{bin_prefix}/bin/micasad.exe
-%{bin_prefix}/bin/micasad-init
-
-%{prefix}/CASA/doc/CASA_Reference_Guide.pdf
-%{prefix}/CASA/doc/License.txt
-%{prefix}/CASA/doc/Readme.txt
-
-
-%files devel 
-%defattr(-,root,root)
-%{bin_prefix}/include/micasa_mgmd.h
-%{bin_prefix}/include/micasa_types.h
-%{bin_prefix}/%{_lib}/miCASA.jar
-
-%files gui
-%defattr(-,root,root)
-%{bin_prefix}/bin/CASAManager.sh
-%{bin_prefix}/bin/CASAManager.exe.config
-%{bin_prefix}/bin/CASAManager.exe
-%{bin_prefix}/share/applications/CASAManager.desktop
-
-%{bin_prefix}/%{_lib}/libad_gk.so.%{bldno}
-%{bin_prefix}/%{_lib}/libad_gk.so
-%{bin_prefix}/%{_lib}/libad_gk.so.1
-%{bin_prefix}/%{_lib}/libad_ff.so.%{bldno}
-%{bin_prefix}/%{_lib}/libad_ff.so
-%{bin_prefix}/%{_lib}/libad_ff.so.1
-%{bin_prefix}/%{_lib}/Novell.CASA.A-D.dll
-%{bin_prefix}/%{_lib}/Novell.CASA.CASAPolicy.dll
-%{bin_prefix}/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll
-%{bin_prefix}/%{_lib}/Novell.CASA.DataEngines.KWallet.dll
-%{bin_prefix}/%{_lib}/Novell.CASA.DataEngines.FireFox.dll
-
-%dir %{prefix}/CASA/images
-%{prefix}/CASA/images/*
-
-%dir %{prefix}/CASA/help
-%dir %{prefix}/CASA/help/en
-%{prefix}/CASA/help/en/*
-
-%changelog -n CASA
diff --git a/CASA-auth-token/package/linux/Makefile.am b/CASA-auth-token/package/linux/Makefile.am
index 241fa316..7eaa5b7f 100644
--- a/CASA-auth-token/package/linux/Makefile.am
+++ b/CASA-auth-token/package/linux/Makefile.am
@@ -23,7 +23,7 @@ RPM_FILE = $(PACKAGE)-$(VERSION)-$(RELEASE).$(target_cpu).rpm
 #SRPM_FILE = $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 SRPM_FILE = $(PACKAGE)-$(VERSION)*.src.rpm
 
-SPEC_FILE = CASA-auth-token.spec
+SPEC_FILE = CASA-auth-token-service.spec
 
 .PHONY: package package-clean package-install package-uninstall casa
 
diff --git a/CASA-auth-token/package/linux/packages.txt b/CASA-auth-token/package/linux/packages.txt
deleted file mode 100644
index e46bd3d0..00000000
--- a/CASA-auth-token/package/linux/packages.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-CASA Auth Token Packages
-
-CASA-auth-token-client.rpm
-
-libclient.so
-
-CASA-auth-token-service.rpm
-
-requires: tomcat, java
-
-AuthTokenSvc-war
-
-CASA-auth-token-native-support.rpm
-
-libserver.so
-
-CASA-auth-token-pam-support.rpm
-
-requires: CASA-auth-token-native-support.rpm pam
-
-pam_module.so
-
-CASA-auth-token-apache2.2-support.rpm
-
-requires: CASA-auth-token-native-support.rpm, apache2.2
-
-apache_mod.so
-
-CASA-auth-token-jaas-support.rpm
-
-requires: java
-
-JaasSupport.jar
-AuthTokenSvc-jar
-
-CASA-auth-token-devel.rpm
-
-requires: CASA-auth-token-native-support.rpm, CASA-auth-token-client.rpm, CASA-auth-token-pam-support.rpm, CASA-auth-token-apache2.2-support.rpm, CASA-auth-token-jaas-support.rpm
-
-client.h
-server.h
-
-
-
-
diff --git a/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am b/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am
index 88f50f93..243c5d6f 100644
--- a/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am
+++ b/CASA-auth-token/server/ApacheSupport/2.2/linux/Makefile.am
@@ -33,10 +33,11 @@ DIST_SUBDIRS =
 
 ROOT = ../../../..
 
-CASAINCLUDE = ../../../../../CASA/include
-
 LIBDIR = $(ROOT)/$(LIB)
-APACHEROOT = ../../../../../../apache2.2
+APACHEINCLUDE = /usr/include/apache2
+APACHELIB = /usr/lib/apache2
+APRINCLUDE = /usr/include/apr-1
+APRLIB = /usr/lib/apr-1 
 
 # handle Mono secondary dependencies
 export MONO_PATH := $(MONO_PATH)
@@ -50,13 +51,13 @@ MODULE_EXT = so
 CFILES = ../mod_authn_casa.c
 
 CSFILES_CSC :=
-INCLUDES = -I. -I$(CASAINCLUDE) -I$(ROOT)/include -I$(APACHEROOT)/include
+INCLUDES = -I. -I$(ROOT)/include -I$(APACHEINCLUDE) -I$(APRINCLUDE)
 RESOURCES =
 DEFINES = -Wno-format-extra-args -fno-strict-aliasing
 
 CFLAGS += $(INCLUDES) $(DEFINES) -D_LARGEFILE64_SOURCE
 LIBS = -lpthread -lcasa_s_authtoken -lapr-1 -laprutil-1
-LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG) -L$(APACHEROOT)/lib -Xlinker -rpath -Xlinker /opt/novell/CASA/lib
+LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG) -L$(APACHELIB) -L$(APRLIB) -Xlinker -rpath -Xlinker /opt/novell/CASA/lib
 
 OBJDIR = ./$(TARGET_CFG)/$(LIB)
 OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
diff --git a/CASA-auth-token/server/AuthTokenSvc/Makefile.am b/CASA-auth-token/server/AuthTokenSvc/Makefile.am
index bdf0d71b..83153460 100644
--- a/CASA-auth-token/server/AuthTokenSvc/Makefile.am
+++ b/CASA-auth-token/server/AuthTokenSvc/Makefile.am
@@ -22,14 +22,19 @@
 SUBDIRS = src
 DIST_SUBDIRS = src
 
-EXTRA_DIST =
+EXTRA_DIST = authtoken.settings \
+		identoken.settings \
+		README \
+		svc.settings \
+		TODO \
+		web.xml
 
 ROOT = ../..
 
 LIBDIR = $(ROOT)/$(LIB)
 
-IDENT_ABSTRACTION_DIR = /home/jluciani/dev-local/bandit/trunk/IdentityAbstraction/build
-IDENT_ABSTRACTION_DEPENDANCIES_DIR = /home/jluciani/dev-local/bandit/trunk/commons/bin
+IDENT_ABSTRACTION_DIR = $(ROOT)/bandit/ia
+IDENT_ABSTRACTION_DEPENDANCIES_DIR = $(ROOT)/bandit/commons
 
 JAVAROOT = .
 JAVAC= javac
diff --git a/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
index 311884e7..caf8cdfb 100644
--- a/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
+++ b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
@@ -553,7 +553,6 @@ public class CasaIdentityToken implements IdentityToken
          Hashtable env = new Hashtable();
          env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
          env.put(IAContext.IA_REALM_CONFIG_LOCATION, svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
-         env.put("java.naming.ldap.attributes.binary", "guid");
          env.put(IAContext.IA_REALM_SELECTOR, sourceName);
 
          DirContext ctx = new InitialDirContext(env);
diff --git a/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java
index 2d20aef6..5814e0f4 100644
--- a/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java
+++ b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java
@@ -225,7 +225,7 @@ public class Krb5Authenticate implements AuthMechanism, Serializable
             SearchResult sr = (SearchResult)answer.next();
             if (searchContext.equals(""))
             {
-               identId = sr.getName();
+               identId = sr.getNameInNamespace();
             }
             else
             {
@@ -254,4 +254,4 @@ public class Krb5Authenticate implements AuthMechanism, Serializable
    {
       return "Krb5Authenticate";
    }
-}
\ No newline at end of file
+}
diff --git a/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Makefile.am b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Makefile.am
index 34de6cd1..34a945e4 100644
--- a/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Makefile.am
+++ b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Makefile.am
@@ -50,7 +50,9 @@ JAVAFILES = ProtoDefs.java \
 	PwdAuthenticate.java \
 	SessionToken.java
 
-EXTRA_DIST = $(JAVAFILES)
+EXTRA_DIST = $(JAVAFILES) \
+		Krb5_mechanism.settings \
+		Pwd_mechanism.settings
 
 .PHONY: package package-clean package-install package-uninstall
 package package-clean package-install package-uninstall:
diff --git a/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
index d723cf19..8a2443c9 100644
--- a/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
+++ b/CASA-auth-token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
@@ -176,7 +176,7 @@ public class PwdAuthenticate implements AuthMechanism, Serializable
                env2.put(IAContext.IA_REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
                env2.put(IAContext.IA_REALM_SELECTOR, authReqMsg.getRealm());              
                env2.put(Context.SECURITY_AUTHENTICATION, "simple");
-               env2.put(Context.SECURITY_PRINCIPAL, sr.getName());
+               env2.put(Context.SECURITY_PRINCIPAL, sr.getNameInNamespace());
                env2.put(Context.SECURITY_CREDENTIALS, pwToken.getPassword());
 
                if ((new InitialDirContext(env2)) != null)
@@ -220,4 +220,4 @@ public class PwdAuthenticate implements AuthMechanism, Serializable
    {
       return "PwdAuthenticate";
    }
-}
\ No newline at end of file
+}
diff --git a/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am
index e62f0457..9350ed4d 100644
--- a/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am
+++ b/CASA-auth-token/server/AuthTokenValidate/idenTokenProviders/casa/linux/Makefile.am
@@ -31,7 +31,7 @@ SUBDIRS =
 
 DIST_SUBDIRS =
 
-ROOT = ../../../../../..
+ROOT = ../../../../..
 
 CASAINCLUDE = ../../../../../../CASA/include
 
diff --git a/CASA-auth-token/server/PamSupport/linux/Makefile.am b/CASA-auth-token/server/PamSupport/linux/Makefile.am
index 15c1b88a..6d9685b9 100644
--- a/CASA-auth-token/server/PamSupport/linux/Makefile.am
+++ b/CASA-auth-token/server/PamSupport/linux/Makefile.am
@@ -55,7 +55,7 @@ DEFINES = -Wno-format-extra-args -fno-strict-aliasing
 
 CFLAGS += $(INCLUDES) $(DEFINES)
 LIBS = -lpthread -lpam -lcasa_s_authtoken
-LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG) -Xlinker -rpath
+LDFLAGS = -Bsymbolic -shared -Wl,-soname=$(MODULE_NAME).$(MODULE_EXT) -L$(LIBDIR)/$(TARGET_CFG)
 
 OBJDIR = ./$(TARGET_CFG)/$(LIB)
 OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))