diff --git a/autogen.sh b/autogen.sh
index cf580cee..638ea289 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,7 +12,16 @@ fi
 if [ ! -d config ]; then
 	mkdir config
 fi
-libtoolize --automake --copy --force
+
+if which libtoolize &> /dev/null ; then
+  libtoolize --automake --copy --force
+elif which glibtoolize &> /dev/null ; then
+  glibtoolize --automake --copy --force
+else
+  echo 'No libtoolize or glibtoolize found!'
+  exit 1
+fi
+
 aclocal -I config
 autoheader
 automake --add-missing --copy
diff --git a/client/config_init.c b/client/config_init.c
index cae7c49a..0b98d21c 100644
--- a/client/config_init.c
+++ b/client/config_init.c
@@ -321,6 +321,12 @@ parse_rc_param(fko_cli_options_t *options, const char *var, char * val)
         if(val[0] == 'y' || val[0] == 'Y')
             options->use_gpg = 1;
     }
+    /* Use GPG Agent ? */
+    else if(CONF_VAR_IS(var, "USE_GPG_AGENT"))
+    {
+        if(val[0] == 'y' || val[0] == 'Y')
+            options->use_gpg_agent = 1;
+    }
     /* GPG Recipient */
     else if(CONF_VAR_IS(var, "GPG_RECIPIENT"))
     {