diff --git a/scripts/check-agent b/scripts/check-agent
index a9bf588..b310087 100644
--- a/scripts/check-agent
+++ b/scripts/check-agent
@@ -1 +1,16 @@
-#!/bin/bash
+# Start ssh-agent and add keys in ~/.ssh directory
+# Should only be used without a desktop manager
+ENV=/tmp/.agent_env
+KEYS=$(basename --suffix=.pub -a $HOME/.ssh/*.pub)
+if [ -z "$SSH_AGENT_PID" ] && [ ! -e "$ENV" ] ; then
+	ssh-agent > $ENV
+	source $ENV
+	for key in $KEYS;
+	do
+		ssh-add ~/.ssh/$key
+	done
+	echo 'Agent started'
+else
+	source $ENV
+	echo 'Agent started already, good to go'
+fi