diff --git a/CASA.changes b/CASA.changes
index c9d43df2..af6c926b 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 14 17:15:34 MST 2006 - jnorman@novell.com
+
+- Bug 150975. Enable GNOME Keyring when gnome-keyring.so is loaded 
+
 -------------------------------------------------------------------
 Tue Feb 14 14:01:20 MST 2006 - jnorman@novell.com
 
diff --git a/c_adlib/GKEngine.cs b/c_adlib/GKEngine.cs
index 9670e067..2e11531e 100644
--- a/c_adlib/GKEngine.cs
+++ b/c_adlib/GKEngine.cs
@@ -56,7 +56,7 @@ namespace Novell.CASA.DataEngines
 
        ~GKEngine()
        {
-           //GnomeKeyring.ReleaseGnomeKeyringLib();
+           GnomeKeyring.ReleaseGnomeKeyringLib();
        }
 
        public XmlNode Aggregate()
@@ -295,10 +295,20 @@ namespace Novell.CASA.DataEngines
 
 	public static Boolean IsStoreAvailable()
         {
+            Console.WriteLine("Checking GKEngine");
               try
               {
-		    System.Runtime.InteropServices.Marshal.PrelinkAll(typeof(GnomeKeyring));
-                    return true;                
+		        System.Runtime.InteropServices.Marshal.PrelinkAll(typeof(GnomeKeyring));
+                if (GnomeKeyring.IsGnomeKeyringInstalled())
+                {
+                    //Console.WriteLine("IsGnomeKeyringInstalled is true");
+                    return true;
+                }
+                else
+                {
+                    //Console.WriteLine("IsGnomeKeyringInstalled is false");
+                    return false;
+                }
               }
               catch(DllNotFoundException d)
               {
diff --git a/c_adlib/ad_gk/native/ad_gk.c b/c_adlib/ad_gk/native/ad_gk.c
index e7022da9..71f020cf 100644
--- a/c_adlib/ad_gk/native/ad_gk.c
+++ b/c_adlib/ad_gk/native/ad_gk.c
@@ -30,7 +30,7 @@
 
 // handle to gnome-keyring library
 static void *gnomeIDK = NULL;
-static char *GNOME_KEYRING_NDK = "libgnome-keyring.so";
+static char *GNOME_KEYRING_NDK = "libgnome-keyring.so.0";
 
 // function typedefs
 SSCS_TYPEDEF_LIBCALL(gpointer, GNOME_KEYRING_UNLOCK_T)
@@ -545,7 +545,7 @@ GnomeKeyringItemType casa_gnome_keyring_item_info_get_type (GnomeKeyringItemInfo
 
 
 //***********************************************************************************************
-static int 
+int 
 LoadGnomeKeyringLibrary()
 {
 	if (!gnomeIDK)
@@ -556,7 +556,7 @@ LoadGnomeKeyringLibrary()
 	return SUCCESS;
 }
 
-static int 
+int 
 ReleaseGnomeKeyringLibrary()
 {
 	if (!gnomeIDK)
diff --git a/c_adlib/ad_gk/native/ad_gk.h b/c_adlib/ad_gk/native/ad_gk.h
index 3af8cb13..3e808b11 100644
--- a/c_adlib/ad_gk/native/ad_gk.h
+++ b/c_adlib/ad_gk/native/ad_gk.h
@@ -75,8 +75,8 @@ int GetItems(char *keyring, GList **itemList);
 int GetItemInfo(char *keyring, int itemId, ItemInfo *info);
 int GetAttributeList(char *keyring, int itemId, GList **);
 int FreeAttributeList(GList *attrList);
-static int LoadGnomeKeyringLibrary();
-static int ReleaseGnomeKeyringLibrary();
+int LoadGnomeKeyringLibrary();
+int ReleaseGnomeKeyringLibrary();
 
 int
 UnlockRing(char *keyring, char *password);
diff --git a/shsrc/lshsrc/mk-micasa_gk-ol b/shsrc/lshsrc/mk-micasa_gk-ol
index d98d6351..debc9906 100644
--- a/shsrc/lshsrc/mk-micasa_gk-ol
+++ b/shsrc/lshsrc/mk-micasa_gk-ol
@@ -22,7 +22,7 @@ fi
 export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
 
 cd $PR/c_adlib/ad_gk/native
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="`pkg-config --cflags glib-2.0` `pkg-config --libs glib-2.0` -O2 -fmessage-length=0 -Wall -fstack-protector" $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="`pkg-config --cflags glib-2.0` `pkg-config --libs glib-2.0` -O2 -fmessage-length=0 -Wall " $2 $3 $4 $5)
 RCODE=$?
 rm -f $COMMON_FILES
 if(test $RCODE != 0)