diff --git a/init.el b/init.el
index 5ba014f..9de2adc 100644
--- a/init.el
+++ b/init.el
@@ -50,6 +50,7 @@
 (require 'prelude-common-lisp)
 (require 'prelude-emacs-lisp)
 (require 'prelude-haskell)
+(require 'prelude-markdown)
 (require 'prelude-ruby)
 
 ;;; init.el ends here
diff --git a/prelude-markdown.el b/prelude-markdown.el
new file mode 100644
index 0000000..a8bfc98
--- /dev/null
+++ b/prelude-markdown.el
@@ -0,0 +1,43 @@
+;;; init.el --- Emacs Prelude: markdown-mode configuration.
+;;
+;; Copyright (c) 2011 Bozhidar Batsov
+;;
+;; Author: Bozhidar Batsov <bozhidar.batsov@gmail.com>
+;; URL: http://www.emacswiki.org/cgi-bin/wiki/Prelude
+;; Version: 1.0.0
+;; Keywords: convenience
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; A simple configuration for markdown-mode.
+
+;;; 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:
+
+(autoload 'markdown-mode "markdown-mode.el"
+  "Major mode for editing Markdown files" t)
+(setq auto-mode-alist
+      (cons '("\\.markdown$" . markdown-mode)
+            (cons '("\\.md$" . markdown-mode) auto-mode-alist)))
+
+(provide 'prelude-markdown)
+
+;;; prelude-markdown.el ends here