Index: trunk/src/sh_sig.c
===================================================================
--- trunk/src/sh_sig.c	(revision 570)
+++ trunk/src/sh_sig.c	(revision 571)
@@ -1069,5 +1069,5 @@
 	    {
 	      dlog(1, FIL__, __LINE__, 
-		   _("Gnupg directory %s for user %s\ndoes not exist or is not accessible.\nPlease add the directory and put the keyring (pubring.gpg) there\nto verify the configuration file.\n"),
+		   _("Gnupg directory %s for user %s\ndoes not exist or is not accessible.\nPlease add the directory and put the keyring (pubring.gpg or pubring.kbx) there\nto verify the configuration file.\n"),
 		   cc4, DEFAULT_IDENT);
 	      status_stat = -3;
@@ -1083,12 +1083,26 @@
       if (status_stat == 0)
 	{
-	  sl_strlcat (cc4,   _("/pubring.gpg"),      SH_PATHBUF+32); 
-	  status_stat =  retry_lstat(FIL__, __LINE__, cc4, &lbuf);
+	  char   cc4_test[SH_PATHBUF+32];
+
+	  sl_strlcpy(cc4_test, cc4, SH_PATHBUF+32);
+	  sl_strlcat (cc4_test,   _("/pubring.gpg"),      SH_PATHBUF+32); 
+
+	  status_stat =  retry_lstat(FIL__, __LINE__, cc4_test, &lbuf);
 	  if (status_stat == -1)
 	    {
-	      dlog(1, FIL__, __LINE__, 
-		   _("Gnupg public keyring %s for user %s\ndoes not exist or is not accessible.\nPlease add the directory and put the keyring (pubring.gpg) there\nto verify the configuration file.\n"),
-		   cc4, DEFAULT_IDENT);
-	      status_stat = -5;
+	      sl_strlcpy(cc4_test, cc4, SH_PATHBUF+32);
+	      sl_strlcat (cc4_test,   _("/pubring.kbx"),      SH_PATHBUF+32);
+
+	      status_stat =  retry_lstat(FIL__, __LINE__, cc4_test, &lbuf);
+	      if (status_stat == -1)
+		{
+		  sl_strlcpy(cc4_test, cc4, SH_PATHBUF+32);
+		  sl_strlcat (cc4_test,   _("/pubring.(gpg|kbx)"),      SH_PATHBUF+32);
+		  
+		  dlog(1, FIL__, __LINE__, 
+		       _("Gnupg public keyring %s for user %s\ndoes not exist or is not accessible.\nPlease add the directory and put the keyring (pubring.gpg or pubring.kbx) there\nto verify the configuration file.\n"),
+		       cc4_test, DEFAULT_IDENT);
+		  status_stat = -5;
+		}
 	    }
 	}