diff --git a/lib/jekyll/commands/draft.rb b/lib/jekyll/commands/draft.rb
index e48523f..0325738 100644
--- a/lib/jekyll/commands/draft.rb
+++ b/lib/jekyll/commands/draft.rb
@@ -18,9 +18,9 @@ def self.init_with_program(prog)
 
       def self.process(args, options = {})
         raise ArgumentError.new('You must specify a name.') if args.empty?
-        
-        type = options["type"].nil? ? "markdown" : options["type"]
-        layout = options["layout"].nil? ? "post" : options["layout"]
+
+        type = options["type"].nil? ? Jekyll::Compose::DEFAULT_TYPE : options["type"]
+        layout = options["layout"].nil? ? Jekyll::Compose::DEFAULT_LAYOUT : options["layout"]
 
         title = args.shift
         name = title.gsub(' ', '-').downcase
@@ -38,7 +38,7 @@ def self.process(args, options = {})
       # Internal: Gets the filename of the draft to be created
       #
       # Returns the filename of the draft, as a String
-      def self.draft_name(name, ext='markdown')
+      def self.draft_name(name, ext=Jekyll::Compose::DEFAULT_TYPE)
         "_drafts/#{name}.#{ext}"
       end
 
diff --git a/lib/jekyll/commands/post.rb b/lib/jekyll/commands/post.rb
index 185895d..87eb335 100644
--- a/lib/jekyll/commands/post.rb
+++ b/lib/jekyll/commands/post.rb
@@ -19,9 +19,9 @@ def self.init_with_program(prog)
 
       def self.process(args, options = {})
         raise ArgumentError.new('You must specify a name.') if args.empty?
-        
-        type = options["type"].nil? ? "markdown" : options["type"]
-        layout = options["layout"].nil? ? "post" : options["layout"]
+
+        type = options["type"].nil? ? Jekyll::Compose::DEFAULT_TYPE : options["type"]
+        layout = options["layout"].nil? ? Jekyll::Compose::DEFAULT_LAYOUT : options["layout"]
 
         date = options["date"].nil? ? Time.now : DateTime.parse(options["date"])
 
diff --git a/lib/jekyll/compose.rb b/lib/jekyll/compose.rb
index 38b80b5..c3c3b51 100644
--- a/lib/jekyll/compose.rb
+++ b/lib/jekyll/compose.rb
@@ -2,6 +2,8 @@
 
 module Jekyll
   module Compose
+    DEFAULT_TYPE = "md"
+    DEFAULT_LAYOUT = "post"
   end
 end