diff --git a/modules/prelude-company.el b/modules/prelude-company.el
new file mode 100644
index 0000000..fa1ffcd
--- /dev/null
+++ b/modules/prelude-company.el
@@ -0,0 +1,47 @@
+;;; prelude-company.el --- company-mode setup
+;;
+;; Copyright © 2011-2014 Bozhidar Batsov
+;;
+;; Author: Bozhidar Batsov <bozhidar@batsov.com>
+;; URL: https://github.com/bbatsov/prelude
+;; Version: 1.0.0
+;; Keywords: convenience
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; company-mode config.
+
+;;; License:
+
+;; 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 GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+(prelude-require-packages '(company))
+
+(require 'company)
+
+(setq company-idle-delay 0.3)
+(setq company-tooltip-limit 10)
+(setq company-minimum-prefix-length 2)
+(setq company-echo-delay 0)
+(setq company-auto-complete nil)
+
+(global-company-mode 1)
+
+(provide 'prelude-company)
+;;; prelude-company.el ends here
diff --git a/sample/prelude-modules.el b/sample/prelude-modules.el
index 8dea72e..840d042 100644
--- a/sample/prelude-modules.el
+++ b/sample/prelude-modules.el
@@ -2,6 +2,7 @@
 
 (require 'prelude-ido) ;; Super charges Emacs completion for C-x C-f and more
 ;; (require 'prelude-helm) ;; Interface for narrowing and search
+(require 'prelude-company)
 
 (require 'prelude-c)
 ;; (require 'prelude-clojure)