diff --git a/manifests/init.pp b/manifests/init.pp
index 855be23f1..43261ddc1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -209,10 +209,12 @@
       if $::kernel == 'windows' {
         $command_path = "${::env_windows_installdir}/bin:${::path}"
       } else {
-        $command_path = "/opt/puppet/bin:${::path}"
+        $command_path = "/opt/puppetlabs/puppet/bin:/opt/puppet/bin:${::path}"
       }
-    } else {
+    } elsif $::kernel == 'windows' {
       $command_path = $::path
+    } else {
+      $command_path = "/opt/puppetlabs/puppet/bin:${::path}"
     }
 
     # if puppet is running as root, this exec should also run as root to allow