diff --git a/src/inst-compendium.nsi b/src/inst-compendium.nsi
index 2280d69e..7f87f93c 100644
--- a/src/inst-compendium.nsi
+++ b/src/inst-compendium.nsi
@@ -1,34 +1,35 @@
 # inst-compendium.nsi - Installer snippet       -*- coding: latin-1; -*-
 # Copyright (C) 2008 g10 Code 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, see <http://www.gnu.org/licenses/>.
 
 
 !ifdef prefix
 !undef prefix
 !endif
 
 
 ${MementoSection} "-compendium" SEC_compendium
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
   # No need to include anything as the manuals are part of gpg4win
 !else
 
   SetOutPath "$INSTDIR\share\gpg4win"
-  File "${BUILD_DIR}/../doc/manual/gpg4win-compendium-*.pdf"
+  File "${BUILD_DIR}/../doc/manual/gpg4win-compendium-de.pdf"
+  File "${BUILD_DIR}/../doc/manual/gpg4win-compendium-en.pdf"
 !endif
 ${MementoSectionEnd}
diff --git a/src/inst-gpgol.nsi b/src/inst-gpgol.nsi
index f26988c0..91243e4c 100644
--- a/src/inst-gpgol.nsi
+++ b/src/inst-gpgol.nsi
@@ -1,107 +1,117 @@
 # inst-gpgol.nsi - Installer snippet for gpgol.      -*- coding: latin-1; -*-
 # Copyright (C) 2005 g10 Code 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 !ifdef prefix
 !undef prefix
 !endif
 !ifdef exprefix
 !undef exprefix
 !endif
 !define prefix ${ipdir}/gpgol-${gpg4win_pkg_gpgol_version}
 !define bdir ${bpdir}/gpgol-${gpg4win_pkg_gpgol_version}-build
 !define exprefix ${exipdir}/gpgol-${gpg4win_pkg_gpgol_version}
 
 
 ${MementoSection} "GpgOL" SEC_gpgol
   SetOutPath "$INSTDIR"
 !ifdef SOURCES
   File "${gpg4win_pkg_gpgol}"
 !else
 
   SetOutPath "$INSTDIR\bin"
   ClearErrors
   SetOverwrite try
   File ${prefix}/bin/gpgol.dll
   SetOverwrite lastused
   ifErrors 0 do_reg
       File /oname=gpgol.dll.tmp ${prefix}/bin/gpgol.dll
       Rename /REBOOTOK gpgol.dll.tmp gpgol.dll
 
  do_reg:
   # Register the DLL.
   RegDLL "$INSTDIR\bin\gpgol.dll"
   ifErrors 0 +2
      MessageBox MB_OK "$(T_GpgOL_RegFailed)"
 
   SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
   File ${prefix}/share/locale/de/LC_MESSAGES/gpgol.mo
   SetOutPath "$INSTDIR\share\locale\sv\LC_MESSAGES"
   File ${prefix}/share/locale/sv/LC_MESSAGES/gpgol.mo
   SetOutPath "$INSTDIR\share\locale\pt\LC_MESSAGES"
   File ${prefix}/share/locale/pt/LC_MESSAGES/gpgol.mo
   SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
   File ${prefix}/share/locale/fr/LC_MESSAGES/gpgol.mo
   SetOutPath "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
   File ${prefix}/share/locale/zh_CN/LC_MESSAGES/gpgol.mo
   SetOutPath "$INSTDIR\share\locale\zh_TW\LC_MESSAGES"
   File ${prefix}/share/locale/zh_TW/LC_MESSAGES/gpgol.mo
   SetOutPath "$INSTDIR\share\locale\nl\LC_MESSAGES"
   File ${prefix}/share/locale/nl/LC_MESSAGES/gpgol.mo
   SetOutPath "$INSTDIR\share\locale\uk\LC_MESSAGES"
   File ${prefix}/share/locale/uk/LC_MESSAGES/gpgol.mo
 
   SetOutPath "$INSTDIR\share\gpgol"
-  File "${prefix}/share/gpgol/*.cfg"
-  File "${prefix}/share/gpgol/*.ico"
+  File "${prefix}/share/gpgol/gpgol.cfg"
+  File "${prefix}/share/gpgol/gpgol-cs.cfg"
+  File "${prefix}/share/gpgol/gpgol-form-signed.cfg"
+  File "${prefix}/share/gpgol/gpgol-ms.cfg"
+  File "${prefix}/share/gpgol/gpgol-form-encrypted.cfg"
+
+  File "${prefix}/share/gpgol/encr-l.ico"
+  File "${prefix}/share/gpgol/encr-s.ico"
+  File "${prefix}/share/gpgol/encr-s-smime.ico"
+  File "${prefix}/share/gpgol/sign-l.ico"
+  File "${prefix}/share/gpgol/sign-s.ico"
+  File "${prefix}/share/gpgol/sign-s-smime.ico"
 
   SetOutPath "$INSTDIR\share\doc\gpgol"
   File "${bdir}/doc/gpgol.pdf"
 
 ${If} ${RunningX64}
 
   # Install the 64 bit version of the dll.
   SetOutPath "$INSTDIR\bin_64"
   ClearErrors
   SetOverwrite try
   File ${exprefix}/bin/gpgol.dll
   SetOverwrite lastused
   ifErrors 0 do_reg64
       File /oname=gpgol.dll.tmp ${exprefix}/bin/gpgol.dll
       Rename /REBOOTOK gpgol.dll.tmp gpgol.dll
 
  do_reg64:
   # Register the DLL. We need to register both versions.  However
   # RegDLL can't be used for 64 bit and InstallLib seems to be a
   # registry hack.
   ClearErrors
   ExecWait '"$SYSDIR\regsvr32" /s "$INSTDIR\bin_64\gpgol.dll"'
   ifErrors 0 +2
      MessageBox MB_OK "$(T_GpgOL_RegFailed) (64 bit)"
 ${EndIf}
 
 !endif
 
 ${MementoSectionEnd}
 
 
 LangString T_GpgOL_RegFailed ${LANG_ENGLISH} \
    "Warning: Registration of the GpgOL Outlook plugin failed."
 
 LangString DESC_SEC_gpgol ${LANG_ENGLISH} \
    "GnuPG for Outlook"