diff --git a/Readme.md b/Readme.md
index 69fd527..1f44311 100644
--- a/Readme.md
+++ b/Readme.md
@@ -61,6 +61,12 @@ For example there is one defined for you `alias e.=explorer .`
 
 All aliases will be saved in `/config/aliases` file
 
+### SSH Agent
+
+To start SSH agent simply call `agent`, which is in the `bin` folder.
+
+If you want to run SSH agent on startup, uncomment the line in `/vendor/init.bat`so it says `@call "%CMDER_ROOT%/bin/agent.cmd"`.
+
 ## Todo
 
 1. Complete PowerShell compatibility.
diff --git a/bin/agent.cmd b/bin/agent.cmd
new file mode 100644
index 0000000..4eaa614
--- /dev/null
+++ b/bin/agent.cmd
@@ -0,0 +1,46 @@
+@ECHO OFF
+ 
+REM Set default sock file
+SET SSH_AUTH_SOCK=/tmp/ssh-agent.sock
+ 
+REM Check socket is available
+IF NOT EXIST "%TMP%\ssh-agent.sock" GOTO:RUNAGENT
+ 
+REM Check if an ssh-agent is running
+FOR /f "tokens=*" %%I IN ('ps ^| grep ssh-agent ^| sed "s/^ *\([0-9]\+\) .*/\1/"') DO SET VAR=%%I
+IF "%VAR%" == "" GOTO:RUNAGENT
+ 
+REM Check if socket file is valid
+ssh-add -l 1> NUL 2>&1
+IF ERRORLEVEL 1 GOTO:RUNAGENT
+GOTO:ADDKEYS
+ 
+:RUNAGENT
+REM Remove old socket file
+rm -f /tmp/ssh-agent.sock
+ 
+REM Run ssh-agent and save (last) PID in VAR
+SET VAR=
+FOR /f "tokens=*" %%J IN ('ssh-agent -a /tmp/ssh-agent.sock') DO FOR /f "tokens=*" %%K IN ('echo %%J ^| grep "SSH_AGENT_PID" ^| sed "s/^SSH_AGENT_PID=\([0-9]\+\); .*/\1/"') DO SET VAR=%%K
+ 
+:ADDKEYS
+SET SSH_AUTH_PID=%VAR%
+ 
+REM Check if ssh keys are known
+SET KEYS=
+FOR /f "tokens=*" %%I IN ('DIR /B "%HOME%\.ssh\*_rsa"') DO CALL:CHECKKEY %%I
+ 
+REM Add missing ssh keys at once
+IF NOT "%KEYS%" == "" ssh-add %KEYS%
+GOTO:END
+ 
+REM Functions
+REM Check if ssh key has to be added
+:CHECKKEY
+SET VAR=
+FOR /f "tokens=*" %%J IN ('ssh-add -l ^| grep "%1"') DO SET VAR=%%J
+IF "%VAR%" == "" SET KEYS='%HOME%\.ssh\%1' %KEYS%
+GOTO:EOF
+ 
+:END
+@ECHO ON
diff --git a/vendor/init.bat b/vendor/init.bat
index 308f932..7734f47 100644
--- a/vendor/init.bat
+++ b/vendor/init.bat
@@ -44,3 +44,5 @@
         @cd /d "%HOME%"
     )
 )
+
+:: @call "%CMDER_ROOT%/bin/agent.cmd"