diff --git a/lib/puppet/util/mode.rb b/lib/puppet/util/mode.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/util/mode.rb
+++ b/lib/puppet/util/mode.rb
@@ -20,11 +20,17 @@ module Puppet
             end
 
             def conf_dir
-                which_dir("/etc/puppet", "~/.puppet")
+                which_dir(
+                    (Puppet.features.win32? ? File.join(Dir::WINDOWS, "puppet", "etc") : "/etc/puppet"), 
+                    "~/.puppet"
+                )
             end
 
             def var_dir
-                which_dir("/var/lib/puppet", "~/.puppet/var")
+                which_dir(
+                    (Puppet.features.win32? ? File.join(Dir::WINDOWS, "puppet", "var") : "/var/lib/puppet"), 
+                    "~/.puppet/var"
+                )
             end
 
             def run_dir
Resolving conflicts with jes<I>:ticket/master/<I>-settings-mode

Jesse moved the code David was patching; the conflict resolution omits David's
change (since the code isn't there to be changed) and this moves the change to
the new location.