diff --git a/manifests/init.pp b/manifests/init.pp
index 399f844..3af0467 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -324,7 +324,14 @@
   }
 
   if $catalina_pid == undef {
-    $catalina_pid_real = "/var/run/${service_name_real}/${service_name_real}.pid"
+    case $install_from {
+      'package' : {
+        $catalina_pid_real = "/var/run/${service_name_real}.pid"
+      }
+      default   : {
+        $catalina_pid_real = "/var/run/${service_name_real}/${service_name_real}.pid"
+      }
+    }
   } else {
     $catalina_pid_real = $catalina_pid
   }
diff --git a/manifests/instance.pp b/manifests/instance.pp
index 07e9021..b68e21d 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -297,7 +297,14 @@
   }
 
   if $catalina_pid == undef {
-    $catalina_pid_real = "/var/run/${service_name_real}/${service_name_real}.pid"
+    case $::tomcat::install_from {
+      'package' : {
+        $catalina_pid_real = "/var/run/${service_name_real}.pid"
+      }
+      default   : {
+        $catalina_pid_real = "/var/run/${service_name_real}/${service_name_real}.pid"
+      }
+    }
   } else {
     $catalina_pid_real = $catalina_pid
   }