diff --git a/keybindings.el b/keybindings.el
index 01f0a0d..b08248a 100644
--- a/keybindings.el
+++ b/keybindings.el
@@ -38,9 +38,13 @@
   (global-set-key (kbd "M--") 'undo-tree-undo)
   (global-set-key (kbd "M-_") 'undo-tree-redo))
 
+;; eproject related keybindings
+(when (require 'eproject nil 'noerror)
+  (global-set-key (kbd "C-c C-f") 'eproject-find-file)
+  (global-set-key (kbd "C-x C-t") 'eproject-find-file))
+
+;; Textmate-mode related keybindings
 (when (require 'textmate nil 'noerror)
-  (global-set-key (kbd "C-c C-f") 'textmate-goto-file)
-  (global-set-key (kbd "C-x C-t") 'textmate-goto-file)
   (global-set-key (kbd "M-p") 'textmate-column-up)
   (global-set-key (kbd "M-n") 'textmate-column-down))
 
diff --git a/languages/ruby.el b/languages/ruby.el
index 53d3956..b01b003 100644
--- a/languages/ruby.el
+++ b/languages/ruby.el
@@ -32,11 +32,13 @@
             (define-key ruby-mode-map
               (kbd "s-r") 'ruby-compilation-this-buffer)
             (define-key ruby-mode-map
-              (kbd "C-x t") 'textmate-goto-file)
+              (kbd "C-x t") 'eproject-find-file)
             (define-key ruby-mode-map
-              (kbd "C-x C-t") 'textmate-goto-file)
+              (kbd "C-x C-t") 'eproject-find-file)
             (define-key ruby-mode-map
-              (kbd "C-c C-l") 'goto-line)))
+              (kbd "C-c C-l") 'goto-line)
+            (define-key ruby-mode-map
+              (kbd "C-c C-b") 'eproject-ibuffer)))
 
 ;; Yasnippet workaround for ruby-electric-mode
 ;; See: http://code.google.com/p/yasnippet/issues/detail?id=71