diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf
index a31fe3f..b889147 100644
--- a/gnupg/gpg-agent.conf
+++ b/gnupg/gpg-agent.conf
@@ -24,10 +24,3 @@ max-cache-ttl 864000
 default-cache-ttl-ssh 86400
 max-cache-ttl-ssh 864000
 
-###+++--- GPGConf ---+++###
-debug-level basic
-log-file socket:///home/hcartiaux/.gnupg/log-socket
-###+++--- GPGConf ---+++### ven. 26 févr. 2016 15:58:47 CET
-# GPGConf edited this configuration file.
-# It will disable options before this marked block, but it will
-# never change anything below these lines.
diff --git a/gnupg/gpg.conf b/gnupg/gpg.conf
index 86e2e4a..2fb2aa9 100644
--- a/gnupg/gpg.conf
+++ b/gnupg/gpg.conf
@@ -76,6 +76,9 @@ verify-options show-uid-validity
 # the agent before it asks for a passphrase.
 use-agent
 
+# assume that arguments are provided as UTF8 strings
+utf8-strings
+
 
 #-----------------------------
 # keyserver
@@ -89,15 +92,14 @@ keyserver https://hkps.pool.sks-keyservers.net
 # keyserver hkps://hkps.pool.sks-keyservers.net
 
 # Provide a certificate store to override the system default
+# Required for GnuPG < 2.1.11
 # Get this from https://sks-keyservers.net/sks-keyservers.netCA.pem
-keyserver-options hkp-cacert=~/.gnupg/certs/sks-keyservers.netCA.pem
+# keyserver-options hkp-cacert=/usr/share/gnupg/sks-keyservers.netCA.pem
 
 # When using --refresh-keys, if the key in question has a preferred keyserver
 # URL, then disable use of that preferred keyserver to refresh the key from
 keyserver-options no-honor-keyserver-url
 
-use-agent
-
 
 #-----------------------------
 # algorithm and ciphers
@@ -117,13 +119,3 @@ cert-digest-algo SHA512
 # This preference list is used for new keys and becomes the default for
 # "setpref" in the edit menu
 default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
-
-
-###+++--- GPGConf ---+++###
-utf8-strings
-debug-level basic
-log-file socket:///home/hcartiaux/.gnupg/log-socket
-###+++--- GPGConf ---+++### ven. 26 févr. 2016 15:58:47 CET
-# GPGConf edited this configuration file.
-# It will disable options before this marked block, but it will
-# never change anything below these lines.