diff --git a/shsrc/lshsrc/CASA.spec b/shsrc/lshsrc/CASA.spec
index 69f24e21..fa0e3f23 100644
--- a/shsrc/lshsrc/CASA.spec
+++ b/shsrc/lshsrc/CASA.spec
@@ -22,7 +22,7 @@ Release:      0
 Summary:      Novell Common Authentication Service Adapter (CASA)
 Source:       %{name}-%{version}.tar.bz2
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-requires:     mono >= 1.1.7 gtk-sharp >= 1.0.9 
+requires:     mono >= 1.1.7
 ExclusiveArch: %ix86 x86_64
 NoSource:     0
 
@@ -42,17 +42,28 @@ Provides:     CASA-devel
 
 %description devel 
 This package contains all necessary include files and libraries needed
-to develop applications that require these.
+to develop applications that can use CASA (Common Authnetication Services Adapter) 
+for credential storage and signle sign on.
+
+%package gui
+Summary:      The CASA Console Utility
+Group:        Productivity/Other
+Requires:     CASA = %{version}-%{release} gtk-sharp >= 1.0.9 
+Provides:     CASA-gui
+
+%description gui 
+This package contains the CASA (Common Authnetication Services Adapter) 
+Management application that allows you to manage credentials within CASA 
+and for your kwallet gnome keyring.  Additionally, you can also link secrets 
+to one another.
 
 %prep
 %setup -q
 
 %ifarch x86_64
 %define binsource bin64
-%define libsource lib64
 %else
 %define binsource bin
-%define libsource lib
 %endif
 
 
@@ -63,11 +74,8 @@ mk-cai-all
 
 mkdir -p %{buildroot}%{prefix}
 mkdir %{buildroot}%{prefix}/CASA
-#mkdir %{buildroot}%{prefix}/%{_lib}
 mkdir %{buildroot}%{prefix}/CASA/%{_lib}
-#mkdir %{buildroot}%{prefix}/bin
 mkdir %{buildroot}%{prefix}/CASA/%{binsource}
-#mkdir %{buildroot}%{prefix}/include
 mkdir %{buildroot}%{prefix}/CASA/include
 mkdir %{buildroot}%{prefix}/CASA/images
 mkdir -p %{buildroot}/%{_lib}/security
@@ -87,6 +95,7 @@ install -m 755 %{_lib}/lux/ndbg/Novell.CASA.DataEngines.KWallet.dll %{buildroot}
 install -m 755 %{binsource}/lux/ndbg/micasad.exe %{buildroot}%{prefix}/CASA/%{binsource}
 install -m 755 %{binsource}/lux/ndbg/CASAManager.exe %{buildroot}%{prefix}/CASA/%{binsource}
 install -m 755 c_gui/CASAManager.sh %{buildroot}%{prefix}/CASA/%{binsource}
+install -m 755 c_gui/CASAManager.desktop %{buildroot}%{prefix}/CASA/
 cp -f c_gui/images/* %{buildroot}%{prefix}/CASA/images
 install -m 755 c_micasad/startup/micasad %{buildroot}%{prefix}/CASA/%{binsource}
 install -m 755 c_micasad/startup/micasad.sh %{buildroot}%{prefix}/CASA/%{binsource}
@@ -98,17 +107,17 @@ cp -f include/micasa_mgmd.h %{buildroot}%{prefix}/CASA/include/
 
 %install
 install -d %{buildroot}%{prefix}/%{_lib}
-install -d %{buildroot}%{prefix}/bin
+install -d %{buildroot}%{prefix}/%{binsource}
 install -d %{buildroot}%{prefix}/include
 install -d %{buildroot}%{prefix}/CASA/%{_lib}
-install -d %{buildroot}%{prefix}/CASA/bin
+install -d %{buildroot}%{prefix}/CASA/%{binsource}
 install -d %{buildroot}%{prefix}/CASA/doc
 install -d %{buildroot}%{prefix}/CASA/include
 install -d %{buildroot}%{prefix}/CASA/images
 install -d %{buildroot}/%{_lib}/security
 
 
-#install -m 644 %{buildroot}%{prefix}/%libsource/miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib}
+#install -m 644 %{buildroot}%{prefix}/%{_lib}/miCASA.jar %{buildroot}%{prefix}/CASA/%{_lib}
 #install -m 644 doc/CASA_Admin_Guide.pdf %{buildroot}%{prefix}/CASA/doc
 #install -m 644 doc/miCASA_API_Guide.pdf %{buildroot}%{prefix}/CASA/doc
 #install -m 644 doc/README.txt %{buildroot}%{prefix}/CASA/doc
@@ -139,9 +148,15 @@ ln -s ../CASA/%{_lib}/Novell.CASA.DataEngines.KWallet.dll %{buildroot}%{prefix}/
 
 ln -s libkwallets_rw.so.%{version} %{buildroot}%{prefix}/CASA/%{_lib}/libkwallets_rw.so
 ln -s libkwallets_rw.so.%{version} %{buildroot}%{prefix}/CASA/%{_lib}/libkwallets_rw.so.1
+
+ln -s ../CASA/%{_lib}/libkwallets_rw.so %{buildroot}%{prefix}/%{_lib}/libkwallets_rw.so
+ln -s ../CASA/%{_lib}/libkwallets_rw.so.1 %{buildroot}%{prefix}/%{_lib}/libkwallets_rw.so.1
 ln -s libad_gk.so.%{version} %{buildroot}%{prefix}/CASA/%{_lib}/libad_gk.so
 ln -s libad_gk.so.%{version} %{buildroot}%{prefix}/CASA/%{_lib}/libad_gk.so.1
 
+ln -s ../CASA/%{_lib}/libad_gk.so %{buildroot}%{prefix}/%{_lib}/libad_gk.so
+ln -s ../CASA/%{_lib}/libad_gk.so.1 %{buildroot}%{prefix}/%{_lib}/libad_gk.so.1
+
 ln -s ../CASA/include/micasa.h %{buildroot}%{prefix}/include/micasa.h
 ln -s ../CASA/include/micasa_mgmd.h %{buildroot}%{prefix}/include/micasa_mgmd.h
 
@@ -152,17 +167,19 @@ ln -s ../CASA/include/micasa_mgmd.h %{buildroot}%{prefix}/include/micasa_mgmd.h
 mkdir -p %{buildroot}/etc/init.d
 cp %{buildroot}%{prefix}/CASA/%{binsource}/micasad %{buildroot}/etc/init.d
 
-#%ifarch x86_64
-#echo "/opt/novell/CASA/lib64/" >> /etc/ld.so.conf
-#/sbin/ldconfig
-#%else
-#echo "/opt/novell/CASA/lib/" >> /etc/ld.so.conf
-#/sbin/ldconfig
-#%endif
-
 
 %post
+if [ $1 -eq 1 ]
+then
         insserv /etc/init.d/micasad	
+        %ifarch x86_64
+	echo "/opt/novell/CASA/lib64/" >> /etc/ld.so.conf
+	/sbin/ldconfig
+	%else
+	echo "/opt/novell/CASA/lib/" >> /etc/ld.so.conf
+	/sbin/ldconfig
+	%endif
+
         perl -e '
         my @fileList = ("/etc/pam.d/xdm", "/etc/pam.d/gdm", "/etc/pam.d/kdm", "/etc/pam.d/login", "/etc/pam.d/sshd");
         for (my $j = 0; $j <= $#fileList; $j++) 
@@ -209,9 +226,12 @@ cp %{buildroot}%{prefix}/CASA/%{binsource}/micasad %{buildroot}/etc/init.d
             }
         }
         '
-
+fi
 %preun
 
+if [ $1 -eq 0 ]
+then
+
 perl -e '
 
     my @fileList = ("/etc/pam.d/xdm", "/etc/pam.d/gdm", "/etc/pam.d/kdm", "/etc/pam.d/login", "/etc/pam.d/sshd" );
@@ -243,27 +263,74 @@ perl -e '
         }
     }
     '
-insserv -r /etc/init.d/micasad
+    perl -e '
+        my $filename = "/etc/ld.so.conf";
+        if (-e $filename)
+        {
+            open (FILE, "<$filename") || die ("Cannot open file reading");
 
+            my @data = <FILE>;
+
+            close (FILE);
+
+            open (FILE, ">$filename") || die ("Cannot open file for writing");
+            for (my $i = 0; $i <= $#data; $i++)
+            {
+                my $line = $data [$i];
+                if ($line =~ /CASA/)
+                {
+                }
+                else
+                {
+                    print FILE $data [$i];
+                }
+            }
+            close (FILE);
+        }
+    '
+/sbin/ldconfig	
+insserv -r /etc/init.d/micasad
+fi 
 
 %clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
 %dir %{prefix}
 %dir %{prefix}/CASA
 %dir %{prefix}/%{_lib}
-%dir %{prefix}/%{_lib}/*
+#%dir %{prefix}/%{_lib}/*
 %dir %{prefix}/CASA/%{_lib}
-%dir %{prefix}/CASA/%{_lib}/*
+#%dir %{prefix}/CASA/%{_lib}/*
+%dir %{prefix}/CASA/%{_lib}/libmicasa.so.%version
+%dir %{prefix}/CASA/%{_lib}/libmicasa.so
+%dir %{prefix}/CASA/%{_lib}/libmicasa.so.1
+%dir %{prefix}/CASA/%{_lib}/libjmicasa.so.%version
+%dir %{prefix}/CASA/%{_lib}/libjmicasa.so
+%dir %{prefix}/CASA/%{_lib}/libjmicasa.so.1
+%dir %{prefix}/CASA/%{_lib}/Novell.CASA.miCASAWrapper.dll
+%dir %{prefix}/CASA/%{_lib}/Novell.CASA.Common.dll
+
+%dir %{prefix}/%{_lib}/libmicasa.so
+%dir %{prefix}/%{_lib}/libmicasa.so.1
+%dir %{prefix}/%{_lib}/libjmicasa.so
+%dir %{prefix}/%{_lib}/libjmicasa.so.1
+
+%dir %{prefix}/%{_lib}/Novell.CASA.miCASAWrapper.dll
+%dir %{prefix}/%{_lib}/Novell.CASA.Common.dll
+
 %dir %{prefix}/%{binsource}
-%dir %{prefix}/%{binsource}/*
 %dir %{prefix}/CASA/%{binsource}
-%dir %{prefix}/CASA/%{binsource}/*
+%{prefix}/CASA/%{binsource}/micasad
+%{prefix}/CASA/%{binsource}/micasad.sh
+%{prefix}/CASA/%{binsource}/micasad.exe
+
+%{prefix}/%{binsource}/micasad
+%{prefix}/%{binsource}/micasad.sh
+%{prefix}/%{binsource}/micasad.exe
+
 %dir %{prefix}/CASA/doc
-%dir %{prefix}/CASA/images
-%dir %{prefix}/CASA/images/*
 
 /etc/init.d/micasad
 /%{_lib}/security/pam_micasa.so
@@ -275,5 +342,36 @@ insserv -r /etc/init.d/micasad
 %{prefix}/CASA/%{_lib}/*.so
 #%{prefix}/CASA/doc/miCASA_API_Guide.pdf
 
+%files gui
+%defattr(-,root,root)
+%dir %{prefix}/CASA/%{binsource}/
+%{prefix}/CASA/%{binsource}/CASAManager.sh
+%{prefix}/CASA/%{binsource}/CASAManager.exe
+%{prefix}/CASA/CASAManager.desktop
+
+%dir %{prefix}/CASA/%{_lib}/
+
+%{prefix}/CASA/%{_lib}/libad_gk.so.%version
+%{prefix}/CASA/%{_lib}/libad_gk.so
+%{prefix}/CASA/%{_lib}/libad_gk.so.1
+%{prefix}/CASA/%{_lib}/libkwallets_rw.so.%version
+%{prefix}/CASA/%{_lib}/libkwallets_rw.so
+%{prefix}/CASA/%{_lib}/libkwallets_rw.so.1
+%{prefix}/CASA/%{_lib}/Novell.CASA.A-D.dll
+%{prefix}/CASA/%{_lib}/Novell.CASA.CASAPolicy.dll
+%{prefix}/CASA/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll
+%{prefix}/CASA/%{_lib}/Novell.CASA.DataEngines.KWallet.dll
+
+%{prefix}/%{_lib}/libad_gk.so
+%{prefix}/%{_lib}/libad_gk.so.1
+%{prefix}/%{_lib}/libkwallets_rw.so
+%{prefix}/%{_lib}/libkwallets_rw.so.1
+%{prefix}/%{_lib}/Novell.CASA.A-D.dll
+%{prefix}/%{_lib}/Novell.CASA.CASAPolicy.dll
+%{prefix}/%{_lib}/Novell.CASA.DataEngines.GnomeKeyring.dll
+%{prefix}/%{_lib}/Novell.CASA.DataEngines.KWallet.dll
+
+%dir %{prefix}/CASA/images
+%dir %{prefix}/CASA/images/*
 
 %changelog -n CASA