diff --git a/CASA.changes b/CASA.changes
index 6ebbdd98..27a1149f 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Fri Feb 17 21:31:10 IST 2006 - smanojna@novell.com
+
+- Bug 147031: CASAManager should have a menu item - FIXED,
+  A menu item for CASAManager gets created within the NLD/SuSE
+  main menu under the following categories,
+  - System > Configuration > Novell CASA Manager
+  - Utilities > Security > Novell CASA Manager
+  - Internet > Administration > Novell CASA Manager
+-------------------------------------------------------------------
 Thu Feb 16 11:43:36 MST 2006 - jnorman@novell.com
 
 - Add dependency to kdelibs3 back to CASA-gui rpm in spec file
diff --git a/c_gui/CASAManager.desktop b/c_gui/CASAManager.desktop
index 3608e505..504e2ff3 100644
--- a/c_gui/CASAManager.desktop
+++ b/c_gui/CASAManager.desktop
@@ -1,8 +1,12 @@
 [Desktop Entry]
-Name=CASA Manager
-Comment=Common Authenication Services Adapter
+Encoding=UTF-8
+Name=Novell CASA Manager
+GenericName=Novell Common Authenication Services Adapter (CASA)
+Comment=Novell CASA Management Console v1.6
+TryExec=CASAManager.sh
 Exec=/usr/bin/CASAManager.sh
 Icon=/usr/share/doc/packages/CASA/images/CASA_48.png
-Terminal=0
+DocPath=/usr/share/doc/packages/CASA/help/en/Contents.htm
+Terminal=false
 Type=Application
-Categories=Application;Network;System
+Categories=Application;System;SystemSetup;Security;Utility;Network;X-Ximian-Main;X-Ximian-Toplevel
diff --git a/shsrc/lshsrc/CASA.spec b/shsrc/lshsrc/CASA.spec
index e87984b8..ba7610d7 100644
--- a/shsrc/lshsrc/CASA.spec
+++ b/shsrc/lshsrc/CASA.spec
@@ -162,6 +162,7 @@ fi
 
 %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" ]
@@ -178,6 +179,7 @@ fi
 
 %postun gui
 /sbin/ldconfig
+rm -f /usr/share/applications/CASAManager.desktop
 %clean
 rm -rf $RPM_BUILD_ROOT