diff --git a/oni-makefile.el b/oni-makefile.el
new file mode 100644
index 0000000..e4ed5ee
--- /dev/null
+++ b/oni-makefile.el
@@ -0,0 +1,41 @@
+;;; oni-makefile.el --- Makefile configuration       -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2019  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+;; Version: 20190228212619
+;; Package-Requires: (fill-column-indicator)
+
+;; 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 <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Makefile configuration.
+
+;;; Code:
+
+(require 'whitespace)
+
+(defun oni-makefile--whitespace-mode ()
+  "Enable whitespace mode with only tabs showing."
+  (setq-local whitespace-style '(face tabs))
+  (whitespace-mode))
+
+(add-hook 'makefile-mode-hook #'oni-makefile--whitespace-mode)
+(add-hook 'makefile-mode-hook 'electric-pair-local-mode)
+(add-hook 'makefile-mode-hook 'fci-mode)
+
+(provide 'oni-makefile)
+;;; oni-makefile.el ends here