diff --git a/lib/jekyll/commands/draft.rb b/lib/jekyll/commands/draft.rb
index e48523f..0b8d0db 100644
--- a/lib/jekyll/commands/draft.rb
+++ b/lib/jekyll/commands/draft.rb
@@ -18,9 +18,11 @@ 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"]
+
+        config = Jekyll.configuration
+
+        type = options["type"] || config["post_type"] || "markdown"
+        layout = options["layout"] || config["post_layout"] || "post"
 
         title = args.shift
         name = title.gsub(' ', '-').downcase
diff --git a/lib/jekyll/commands/post.rb b/lib/jekyll/commands/post.rb
index 185895d..7c0887d 100644
--- a/lib/jekyll/commands/post.rb
+++ b/lib/jekyll/commands/post.rb
@@ -19,9 +19,11 @@ 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"]
+
+        config = Jekyll.configuration
+
+        type = options["type"] || config["post_type"] || "markdown"
+        layout = options["layout"] || config["post_layout"] || "post"
 
         date = options["date"].nil? ? Time.now : DateTime.parse(options["date"])