diff --git a/src/gpg.conf b/src/gpg.conf
new file mode 100644
index 00000000..1d7ab7a8
--- /dev/null
+++ b/src/gpg.conf
@@ -0,0 +1,33 @@
+# This is an exmple for the system wide configuration
+# of GnuPG.
+# Similar files for other components:
+# gpg-agent.conf gpgsm.conf dirmngr.conf scdaemon.conf
+# can be created in this directory. The syntax
+# is the same as the user configuration which is documented
+# in the manual of GnuPG.
+
+# The system wide configuration supports as addional syntax
+# forced options and ignore options.
+# Groups are started by using [force] and [ignore] and
+# ended by using [-force] and [-ignore] tags.
+# There can be multiple groups.
+
+# Example:
+
+#[force]
+# Enforce the compliance to NATO RESTIRCTED / VS-NfD:
+# compliance de-vs
+#[-force]
+
+#[ignore]
+#   User should not be able to fake the time:
+# faked-system-time
+#   The passphrase should never be provided as command line argument
+#   always use --passphrase-file or --passphrase-fd for this:
+# passphrase
+#[-ignore]
+
+# Alternatively defaults can be provided that a user might
+# change. For Example:
+# Uncomment the following to disable all network requests
+# disable-dirmngr
diff --git a/src/inst-gnupg-w32.nsi b/src/inst-gnupg-w32.nsi
index 954ded04..e7f8f271 100644
--- a/src/inst-gnupg-w32.nsi
+++ b/src/inst-gnupg-w32.nsi
@@ -1,63 +1,67 @@
 # inst-gnupg2.nsi - Installer snippet for gnupg-w32. -*- coding: latin-1; -*-
 # Copyright (C) 2015 Intevation GmbH
 #
 # This file is part of Gpg4win.
 #
 # Gpg4win is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # Gpg4win is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
 !ifdef prefix
 !undef prefix
 !endif
 !define prefix ${ipdir}/gnupg-w32-${gpg4win_pkg_gnupg_w32_version}
 !define source ${bpdir}/gnupg-w32-${gpg4win_pkg_gnupg_w32_version}
 
 ${MementoSection} "GnuPG" SEC_gnupg_w32
   SectionIn RO
 
 !ifdef SOURCES
   SetOutPath "$INSTDIR"
   File "${gpg4win_pkg_gnupg_w32}"
 !else
 
 SetOutPath "$TEMP"
   DetailPrint  "$(T_Installing_GnuPG) ${gpg4win_pkg_gnupg_w32_version}"
   File "${prefix}/gnupg-w32-${gpg4win_pkg_gnupg_w32_version}-bin.exe"
   ExecWait '"$TEMP\gnupg-w32-${gpg4win_pkg_gnupg_w32_version}-bin.exe" /S /D=$INSTDIR\..\GnuPG' $0
 
   IntCmp $0 0 done 0
   MessageBox MB_OK|MB_ICONEXCLAMATION "$(T_Gpg_Install_failed)"
 done:
   SetOutPath "$INSTDIR\..\GnuPG\bin"
   File /oname=gpg-w32.exe     "${BUILD_DIR}/gpgwrap.exe"
   File /oname=gpgsm-w32.exe   "${BUILD_DIR}/gpgwrap.exe"
   File /oname=gpgconf-w32.exe "${BUILD_DIR}/gpgwrap.exe"
+  SetOutPath "$LocalAppData\GNU\etc\gnupg"
+# BEGIN MSI IGNORE
+  File "${BUILD_DIR}/gpg.conf"
+# END MSI IGNORE
 
   Delete "$TEMP\gnupg-w32-${gpg4win_pkg_gnupg_w32_version}-bin.exe"
 !endif
 ${MementoSectionEnd}
 
 LangString T_Installing_GnuPG ${LANG_ENGLISH} \
    "Installing GnuPG"
 
 LangString DESC_SEC_gnupg_w32 ${LANG_ENGLISH} \
    "GNU Privacy Guard"
 
 LangString T_Gpg_Install_failed ${LANG_ENGLISH} \
    "Failed to install GnuPG.$\r$\n \
    Gpg4win will not work properly without GnuPG.$\r$\n \
    Please download and install the simple installer \
    for GnuPG from:$\r$\n$\r$\n \
    https://gnupg.org/download"