diff -uNr hiera-3.3.1.ORIG/lib/hiera/util.rb hiera-3.3.1/lib/hiera/util.rb
--- hiera-3.3.1.ORIG/lib/hiera/util.rb	2017-06-01 15:41:12.908907573 +0200
+++ hiera-3.3.1/lib/hiera/util.rb	2017-06-01 15:41:45.015503104 +0200
@@ -28,7 +28,7 @@
       if microsoft_windows?
          File.join(common_appdata, 'PuppetLabs', 'puppet', 'etc')
       else
-        '/etc/puppetlabs/puppet'
+        '/etc/puppet'
       end
     end
 
@@ -36,7 +36,7 @@
       if microsoft_windows?
         File.join(common_appdata, 'PuppetLabs', 'code')
       else
-        '/etc/puppetlabs/code'
+        '/etc/puppet'
       end
     end