diff --git a/oni-core.el b/oni-core.el
index dfc8aa9..9f194ca 100644
--- a/oni-core.el
+++ b/oni-core.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 20190303150119
+;; Version: 20190303195344
 ;; Package-Requires: (oni-data-dir expand-region multiple-cursors embrace)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -93,9 +93,6 @@
   (add-to-list 'exec-path "C:/Program Files/Git/usr/bin")
   (add-to-list 'exec-path "c:/cygwin64/bin")
 
-  (setq find-program (shell-quote-argument "c:/cygwin64/bin/find.exe"))
-  (setq grep-program (shell-quote-argument "c:/cygwin64/bin/grep.exe"))
-  (setq grep-use-null-device nil)
   (setq delete-by-moving-to-trash t)
 
   (setq-default buffer-file-coding-system 'utf-8-unix))
diff --git a/oni-grep.el b/oni-grep.el
new file mode 100644
index 0000000..5eed832
--- /dev/null
+++ b/oni-grep.el
@@ -0,0 +1,45 @@
+;;; oni-grep.el --- Grep configuration               -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2019  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+;; Version: 20190303195835
+
+;; 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:
+
+;; Grep configuration
+
+;;; Code:
+
+(require 'find-dired)
+(require 'grep)
+
+(add-to-list 'grep-files-aliases '("msbuild" . "*.targets *.proj"))
+
+(when (eq system-type 'windows-nt)
+  (setq find-program (shell-quote-argument "c:/cygwin64/bin/find.exe"))
+  (setq grep-program (shell-quote-argument "c:/cygwin64/bin/grep.exe"))
+  (setq grep-use-null-device nil)
+
+  (let ((exe (shell-quote-argument "c:/cygwin64/bin/ls.exe")))
+    (setq find-ls-option
+          (cons (concat "-exec " exe " -ld {} \";\"") "-ld"))))
+
+;;;###autoload(with-eval-after-load 'grep (require 'grep))
+
+(provide 'oni-grep)
+;;; oni-grep.el ends here