diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96fb49257..3a2fa9d2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@ BUG FIXES:
   - Fix bug in VirtualBox provider where port forwarding just didn't work if
     you attempted to forward to a port under 1024. [GH-1421]
   - Fix cross-device box adds for Windows. [GH-1424]
+  - Fix minor issues with defaults of configuration of the shell
+    provisioner.
 
 ## 1.1.0 (March 14, 2013)
 
diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb
index 6c9e4d223..400921690 100644
--- a/plugins/provisioners/shell/config.rb
+++ b/plugins/provisioners/shell/config.rb
@@ -7,7 +7,16 @@ module VagrantPlugins
       attr_accessor :args
 
       def initialize
-        @upload_path = "/tmp/vagrant-shell"
+        @args        = []
+        @inline      = UNSET_VALUE
+        @path        = UNSET_VALUE
+        @upload_path = UNSET_VALUE
+      end
+
+      def finalize!
+        @inline      = nil if @inline == UNSET_VALUE
+        @path        = nil if @path == UNSET_VALUE
+        @upload_path = "/tmp/vagrant-shell" if @upload_path == UNSET_VALUE
       end
 
       def validate(machine)