diff --git a/evil-collection-buff-menu.el b/evil-collection-buff-menu.el
new file mode 100644
index 0000000..6317e2c
--- /dev/null
+++ b/evil-collection-buff-menu.el
@@ -0,0 +1,36 @@
+;;; evil-collection-buff-menu.el --- Bindings for `buff-menu'. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2017 James Nguyen
+
+;; Author: James Nguyen <james@jojojames.com>
+;; Maintainer: James Nguyen <james@jojojames.com>
+;; Pierre Neidhardt <ambrevar@gmail.com>
+;; URL: https://github.com/jojojames/evil-collection
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "25.1"))
+;; Keywords: evil, emacs, tools
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;; Bindings for `buff-menu'.
+
+;;; Code:
+(defun evil-collection-buff-menu-setup ()
+  "Set up `evil' bindings for `buff-menu'.."
+  ;; FIXME: Fill me in!
+  (evil-add-hjkl-bindings Buffer-menu-mode-map 'motion))
+
+(provide 'evil-collection-buff-menu)
+;;; evil-collection-buff-menu.el ends here
diff --git a/evil-collection-integration.el b/evil-collection-integration.el
index 32b377b..74fbade 100644
--- a/evil-collection-integration.el
+++ b/evil-collection-integration.el
@@ -98,10 +98,6 @@
   (when (fboundp 'evil-repeat-abort)
     (evil-repeat-abort)))
 
-;;; Buffer-menu
-
-(evil-add-hjkl-bindings Buffer-menu-mode-map 'motion)
-
 ;; dictionary.el
 
 (evil-add-hjkl-bindings dictionary-mode-map 'motion
diff --git a/evil-collection.el b/evil-collection.el
index bb83241..5359c0d 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -62,6 +62,7 @@ or evil-collection.")
     anaconda-mode
     arc-mode
     bookmark
+    (buff-menu "buff-menu")
     calendar
     cider
     cmake-mode