diff --git a/craftbukkit b/craftbukkit
index 61bc617..32b5d6a 100644
--- a/craftbukkit
+++ b/craftbukkit
@@ -9,9 +9,6 @@
 # Description: Craftbukkit Minecraft Server
 ### END INIT INFO
 
-# @TODO
-# - Implement logging
-
 # Config START
 USER="craftbukkit"
 SRVPATH="/opt/craftbukkit"
@@ -40,9 +37,11 @@ server_start() {
       log_failure_msg
       exit 1
     elif sleep 1 && ! server_running; then  # Tmux started, but Java did not
+      logger -t craftbukkit -p local0.crit "Craftbukkit start failed"
       log_failure_msg
       exit 1
     else
+      logger -t craftbukkit -p local0.info "Craftbukkit minecraft server started"
       log_success_msg
     fi
   else
@@ -61,9 +60,11 @@ server_stop() {
     sudo -u ${USER} tmux send-keys -t craftbukkit-console "stop" C-m  >/dev/null 2>&1
     sleep 10
     if server_running; then
+      logger -t craftbukkit -p local0.crit "Craftbukkit shutdown failed"
       log_failure_msg
       exit 1
     else
+      logger -t craftbukkit -p local0.info "Craftbukkit minecraft server stopped"
       log_success_msg
     fi
   else