diff --git a/emacs.d/init-eshell.el b/emacs.d/init-eshell.el
index 1a3c53944..59cebe62a 100644
--- a/emacs.d/init-eshell.el
+++ b/emacs.d/init-eshell.el
@@ -57,6 +57,8 @@
 
 (setq eshell-prompt-function 'prompt-f)
 (setq eshell-highlight-prompt nil)
+(setq eshell-prompt-regexp "^.+? \\((\\(git\\|svn\\|hg\\|darcs\\|cvs\\|bzr\\):.+?) \\)?[$#] ")
+
 
 ;; EShell functions that come in handy