diff --git a/src/ChangeLog b/src/ChangeLog
index d5b70f09..fa4a0275 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2012-08-28  Tim Ruehsen  <tim.ruehsen@gmx.de>
 
 	* gnutls.c (ssl_check_certificate): deinit gnutls_x509_crt_t.
+	* gnutls.c (ssl_init): don't error if CA directory is empty.
 
 2012-07-07  Giuseppe Scrivano  <gscrivano@gnu.org>
 
diff --git a/src/gnutls.c b/src/gnutls.c
index 69b1cb27..af0b697d 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -99,7 +99,7 @@ ssl_init (void)
   dir = opendir (ca_directory);
   if (dir == NULL)
     {
-      if (opt.ca_directory)
+      if (opt.ca_directory && *opt.ca_directory)
         logprintf (LOG_NOTQUIET, _("ERROR: Cannot open directory %s.\n"),
                    opt.ca_directory);
     }