diff --git a/CASA.changes b/CASA.changes
index 5be1ce0e..9649c728 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,3 +1,10 @@
+------------------------------------------------------------------
+Wed Mar 1 10:35:19 MST 2006 - cmashayekhi@novell.com
+
+- CASA.spec was modified to put the CASAManager.sh in /usr/bin.
+- CASAManager.desktop was modified to point to CASAManager.sh in /usr/bin.
+- CASA.spec and CASA_dbg.spec were synced up.
+
 -------------------------------------------------------------------
 Wed Mar 1 16:30:00 IST 2006 - mmanohar@novell.com
 
diff --git a/c_gui/CASAManager.desktop b/c_gui/CASAManager.desktop
index 537af327..f40be8d3 100644
--- a/c_gui/CASAManager.desktop
+++ b/c_gui/CASAManager.desktop
@@ -4,7 +4,7 @@ Name=Novell CASA Manager
 GenericName=Novell Common Authenication Services Adapter (CASA)
 Comment=Novell CASA Management Console v1.6
 TryExec=CASAManager.sh
-Exec=/usr/sbin/CASAManager.sh
+Exec=/usr/bin/CASAManager.sh
 Icon=/usr/share/doc/packages/CASA/images/CASA_48.png
 DocPath=/usr/share/doc/packages/CASA/help/en/Contents.htm
 Terminal=false
diff --git a/shsrc/lshsrc/CASA.spec b/shsrc/lshsrc/CASA.spec
index 7520a48d..ef36f81c 100644
--- a/shsrc/lshsrc/CASA.spec
+++ b/shsrc/lshsrc/CASA.spec
@@ -110,7 +110,7 @@ install -m 755 %{_lib}/lux/ndbg/Novell.CASA.DataEngines.FireFox.dll %{buildroot}
 
 install -m 755 %{binsource}/lux/ndbg/micasad.exe %{buildroot}%{bin_prefix}/bin
 install -m 755 %{binsource}/lux/ndbg/CASAManager.exe %{buildroot}%{bin_prefix}/bin
-install -m 755 c_gui/CASAManager.sh %{buildroot}%{bin_prefix}/sbin
+install -m 755 c_gui/CASAManager.sh %{buildroot}%{bin_prefix}/bin
 install -m 755 c_gui/CASAManager.exe.config %{buildroot}%{bin_prefix}/bin
 install -m 755 c_gui/images/* %{buildroot}%{prefix}/CASA/images
 install -m 755 c_gui/help/en/* %{buildroot}%{prefix}/CASA/help/en
@@ -169,7 +169,7 @@ echo " "
 #then
 #	casacfgpam
 #fi
-casacfgpam
+/usr/sbin/casacfgpam
 /sbin/ldconfig
 
 %post gui
@@ -178,7 +178,7 @@ casacfgpam
 %stop_on_removal micasad
 if [ "x$1" == "x0" ]
 then
-	casaucfgpam
+	/usr/sbin/casaucfgpam
 fi
 
 
@@ -230,7 +230,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gui
 %defattr(-,root,root)
-%{bin_prefix}/sbin/CASAManager.sh
+%{bin_prefix}/bin/CASAManager.sh
 %{bin_prefix}/bin/CASAManager.exe.config
 %{bin_prefix}/bin/CASAManager.exe
 %{bin_prefix}/share/applications/CASAManager.desktop
diff --git a/shsrc/lshsrc/CASA_dbg.spec b/shsrc/lshsrc/CASA_dbg.spec
index 931e37ac..79cb5fa8 100644
--- a/shsrc/lshsrc/CASA_dbg.spec
+++ b/shsrc/lshsrc/CASA_dbg.spec
@@ -110,9 +110,8 @@ install -m 755 %{_lib}/lux/dbg/Novell.CASA.DataEngines.FireFox.dll %{buildroot}%
 
 install -m 755 %{binsource}/lux/dbg/micasad.exe %{buildroot}%{bin_prefix}/bin
 install -m 755 %{binsource}/lux/dbg/CASAManager.exe %{buildroot}%{bin_prefix}/bin
-install -m 755 c_gui/CASAManager.sh %{buildroot}%{bin_prefix}/sbin
+install -m 755 c_gui/CASAManager.sh %{buildroot}%{bin_prefix}/bin
 install -m 755 c_gui/CASAManager.exe.config %{buildroot}%{bin_prefix}/bin
-install -m 755 c_gui/CASAManager.desktop %{buildroot}%{prefix}/CASA/
 install -m 755 c_gui/images/* %{buildroot}%{prefix}/CASA/images
 install -m 755 c_gui/help/en/* %{buildroot}%{prefix}/CASA/help/en
 install -m 755 c_micasad/startup/micasad %{buildroot}/etc/init.d
@@ -158,6 +157,9 @@ 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 c_gui/CASAManager.desktop %{buildroot}/usr/share/applications
+%suse_update_desktop_file CASAManager
 
 %post
 echo " "
@@ -167,17 +169,16 @@ echo " "
 #then
 #	casacfgpam
 #fi
-casacfgpam
+/usr/sbin/casacfgpam
 /sbin/ldconfig
 
 %post gui
 /sbin/ldconfig
-cp -f /usr/share/doc/packages/CASA/CASAManager.desktop /usr/share/applications/
 %preun
 %stop_on_removal micasad
 if [ "x$1" == "x0" ]
 then
-	casaucfgpam
+	/usr/sbin/casaucfgpam
 fi
 
 
@@ -230,10 +231,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gui
 %defattr(-,root,root)
-%{bin_prefix}/sbin/CASAManager.sh
+%{bin_prefix}/bin/CASAManager.sh
 %{bin_prefix}/bin/CASAManager.exe.config
 %{bin_prefix}/bin/CASAManager.exe
-%{prefix}/CASA/CASAManager.desktop
+%{bin_prefix}/share/applications/CASAManager.desktop
 
 
 %{bin_prefix}/%{_lib}/libad_gk.so.%{bldno}