diff --git a/optional/config/install-keepass2.txt b/optional/config/install-keepass2.txt
new file mode 100644
index 0000000..0e58a76
--- /dev/null
+++ b/optional/config/install-keepass2.txt
@@ -0,0 +1,9 @@
+[Setup]
+Lang=en
+Dir=C:\Program Files\KeePass Password Safe 2
+Group=KeePass Password Safe 2
+NoIcons=0
+SetupType=custom
+Components=core
+Tasks=fileassoc,desktopicon
+
diff --git a/optional/install-keepass2.cmd b/optional/install-keepass2.cmd
new file mode 100644
index 0000000..3c6d16f
--- /dev/null
+++ b/optional/install-keepass2.cmd
@@ -0,0 +1,24 @@
+@echo off
+
+set CONFIG=config\install-keepass2.txt
+set EXE=..\software\keepass2-setup.exe
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+
+echo killing KeePass 2 process ...
+taskkill /F /IM KeePass.exe 2>nul
+
+echo installing KeePass 2 ...
+start /wait %EXE% /LOADINF=%CONFIG% /NORESTART /NOCANCEL /SILENT /SUPPRESSMSGBOXES /CLOSEAPPLICATIONS
+
+rem refresh desktop (W10 style)
+ie4uinit.exe -show
+
+echo ####### %0 #######
+pause
+
diff --git a/optional/install-sharemouse.cmd b/optional/install-sharemouse.cmd
index 4233f7e..4632eae 100644
--- a/optional/install-sharemouse.cmd
+++ b/optional/install-sharemouse.cmd
@@ -2,7 +2,6 @@
 
 set CONFIG=config\install-sharemouse.txt
 set EXE=..\software\sharemouse-setup.exe
-set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
 
 if NOT EXIST %EXE% (
   echo ERROR: %EXE% not found!
diff --git a/software/optional.csv b/software/optional.csv
index f7ff8ce..6943628 100644
--- a/software/optional.csv
+++ b/software/optional.csv
@@ -30,4 +30,5 @@ https://www.ausweisapp.bund.de/fileadmin/user_upload/Software/AusweisApp2-1.22.5
 https://updates.tdesktop.com/tx64/tsetup-x64.3.7.3.exe telegram-setup.exe
 https://www.sharemouse.com/ShareMouseSetup.exe sharemouse-setup.exe
 https://download01.logi.com/web/ftp/pub/techsupport/options/options_installer.exe logitechoptions-setup.exe
+https://sourceforge.net/projects/keepass/files/KeePass%202.x/2.51.1/KeePass-2.51.1-Setup.exe/download?use_mirror=netcologne# keepass2-setup.exe