diff --git a/evil-collection-flymake.el b/evil-collection-flymake.el
new file mode 100644
index 0000000..1b63d05
--- /dev/null
+++ b/evil-collection-flymake.el
@@ -0,0 +1,49 @@
+;;; evil-collection-flymake.el --- Evil Bindings for Flymake -*- lexical-binding: t -*-
+
+;; Copyright (C) 2018 James Nguyen
+
+;; Author: James Nguyen <james@jojojames.com>
+;; Maintainer: James Nguyen <james@jojojames.com>
+;; Pierre Neidhardt <mail@ambrevar.xyz>
+;; URL: https://github.com/emacs-evil/evil-collection
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "25.1"))
+;; Keywords: evil, flymake, 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:
+;; Evil bindings for `flymake-mode'.
+
+;;; Code:
+(require 'flymake)
+(require 'evil-collection)
+
+(defconst evil-collection-flymake-maps '(flymake-mode-map
+                                         flymake-diagnostics-buffer-mode-map))
+
+(defun evil-collection-flymake-setup ()
+  "Set up `evil' bindings for `flymake'."
+  (evil-collection-define-key
+    '(normal visual) 'flymake-diagnostics-buffer-mode-map
+    "q" 'quit-window
+    (kbd "RET") 'flymake-goto-diagnostic
+    (kbd "<S-return>") 'flymake-show-diagnostic
+    (kbd "M-RET") 'flymake-show-diagnostic
+    (kbd "go") 'flymake-show-diagnostic
+    (kbd "gO") 'flymake-show-diagnostic
+    "." 'flymake-goto-diagnostic))
+
+(provide 'evil-collection-flymake)
+;;; evil-collection-flymake.el ends here
diff --git a/evil-collection.el b/evil-collection.el
index 72932b1..25dea26 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -100,6 +100,7 @@ or evil-collection.")
     etags-select
     eww
     flycheck
+    flymake
     free-keys
     geiser
     ggtags