--- databases/py-carbon/files/carbon.in	(revision 324248)
+++ databases/py-carbon/files/carbon.in	(working copy)
@@ -41,6 +41,7 @@ 
 
 status_cmd="${name}_status"
 stop_cmd="${name}_stop"
+required_files="${carbon_conf} /usr/local/etc/carbon/storage-schemas.conf"
 
 command_interpreter="/usr/local/bin/python2.7"
 command="/usr/local/bin/carbon-cache.py"
@@ -48,8 +49,10 @@ 
 
 carbon_stop() {
     echo "Stopping $name"
+    pids=`check_pidfile ${carbon_pidfile} ${command} ${command_interpreter}`
 
     /usr/local/bin/carbon-cache.py --config=${carbon_conf} --pidfile ${carbon_pidfile} stop
+    wait_for_pids ${pids}
 }
 
 carbon_status() {