diff --git a/rootfs/etc/init.d/minecraft_server b/rootfs/etc/init.d/minecraft_server
new file mode 100755
index 00000000..8c13c54a
--- /dev/null
+++ b/rootfs/etc/init.d/minecraft_server
@@ -0,0 +1,395 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:       minecraft_server
+# Required-Start: $remote_fs $syslog
+# Required-Stop:  $remote_fs $syslog
+# Default-Start:  2 3 4 5
+# Default-Stop:   0 1 6
+# chkconfig:      345 50 50
+# Description:    Minecraft Server Control Script
+### END INIT INFO
+#
+# startscript for spigot minecraft server
+#
+# (c) 2015-2016 nimmis <kjell.havneskold@gmail.com>
+#
+
+MC_USER=minecraft       # User name running the minecraft server
+MC_PROC=spigot.jar   # name of minecraft jar file
+MC_DIR=/minecraft/ # Directory where the server should run
+MC_JAVA_OPS='-Xmx1G -Xms1G'   # java options for minecraft server
+
+JAVACMD=$(which java)
+
+USAGE=$(cat <<EOF
+Usage:  $0 <option>
+
+Options:
+
+  start
+    Start the Minecraft server.
+
+  stop
+    Stop the Minecraft server.
+
+  restart
+    Restart the Minecraft server.
+
+  create <version> 
+    Create a minecraft server, version is the version of minecraft you want to use.
+    latest gives the latest version. Does not clean other files in the directory
+
+  status
+    Give the status of the server
+
+  accept-eula
+    Accepts Mojangs EULA and set eula.txt correct
+
+  send "<command>"
+    Sends a command to the Minecraft server
+
+  log
+    show output log from the Minecraft server
+
+  backup
+    Makes a backup of the world
+EOF
+)
+
+#
+# get the PID for minecraft server pocess
+#
+
+getPID() {
+  local PID
+  PID=$( ps -f -u $MC_USER | grep "$MC_PROC" | grep -v "sh -c" |  grep -v grep | awk '{print $2}' )
+  printf "%d\n" $PID
+}
+
+#
+# return 1 if the minecraft server is running othervise 0
+#
+
+isRunning() {
+  if [  $(getPID) -eq 0 ] ; then
+	echo 0
+  else
+	echo 1
+  fi
+}
+
+# execute command as minecraft user
+
+execCMD() {
+	# if running as root, switch to defined user
+
+	if [ $(id -u) -eq 0 ]; then
+		su -s /bin/sh -c "$1" $MC_USER $2
+	else
+		sh -c "$1" $2
+	fi
+}
+
+#
+# setProp
+#
+# setProp <filename> <property> <value>
+#
+#
+setProp() {
+
+  grep -q "^$2\s*\=" $1
+
+  if [ $? -ne 0 ] ; then
+	echo "$prop=$val" >> $1
+  else
+    sed -i "/^$2\s*=/ c $2=$3" $1
+  fi
+
+}
+
+#
+# send a command to the running minecraft server
+sendCMD() {
+  echo $1 >> $MC_DIR/input.con
+}
+
+#
+# create eula.txt if it does not exist
+#
+
+createEULA() {
+
+  if [ ! -f $MC_DIR/eula.txt  ] ; then
+       execCMD "echo '#EULA file created by minecraft script\neula=false' > $MC_DIR/eula.txt"
+  fi
+
+}
+
+#
+# EULA accepted (0) or not (1)
+#
+
+acceptEULA() {
+  local OK=1
+  grep eula $MC_DIR/eula.txt |  grep -q 'true' && OK=0
+  echo "$OK"
+}
+
+# 
+# check that all is ok the start server
+#
+
+checkOK() {
+
+  # check that the directory exists
+
+  if [ ! -d $MC_DIR ] ; then
+	echo "$MC_DIR does not exist" ;
+	exit 1
+  fi
+
+  # and there are a jar file in it
+
+  if [ ! -f $MC_DIR/$MC_PROC ] ; then
+	echo "the minecraftfile $MC_DIR/$MC_PROC does not exist."
+	exit 1
+  fi 
+
+  # check to see that minecraft user can write in the
+
+  execCMD "touch $MC_DIR/testfile 2> /dev/null"
+  if [ ! -f $MC_DIR/testfile ] ; then
+	echo "the user $MC_USER has not write access to directory $MC_DIR"
+	exit 1
+  else
+    rm $MC_DIR/testfile
+  fi
+
+  # check if EULA accepted
+
+  createEULA
+
+  if [ $(acceptEULA) -eq 1 ] ; then
+	echo "you must accept Mojangs EULA, either set eula=true in $MC_DIR/eula.txt"
+	echo "or run $0 accept-eula"
+	exit 1
+  fi
+	
+}
+
+
+#
+# create spigot jar for requested version
+#
+
+buildjar() {
+  # build it if it not exists
+  if [ ! -f /$SPIGOT_HOME/spigot-$1.jar ]; then
+    echo "Building spigot version ($1) jar file, be patient"
+    if [ -d /$SPIGOT_HOME/build ]; then
+	execCMD "rm -Rf /$SPIGOT_HOME/build"
+    fi
+    execCMD "mkdir -p /$SPIGOT_HOME/build"
+    execCMD "wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar -O /$SPIGOT_HOME/build/BuildTools.jar"
+    execCMD "cd /$SPIGOT_HOME/build;HOME=/$SPIGOT_HOME/build java -jar BuildTools.jar --rev $1"
+    execCMD "cp /$SPIGOT_HOME/build/Spigot/Spigot-Server/target/spigot-*.jar /$SPIGOT_HOME/spigot-$1.jar"
+    execCMD "rm -Rf /$SPIGOT_HOME/build"
+  fi
+  execCMD "rm -f /$SPIGOT_HOME/spigot.jar"
+  execCMD "ln -s /$SPIGOT_HOME/spigot-$1.jar /$SPIGOT_HOME/spigot.jar"
+}
+	
+#
+# prepare console files
+#
+
+ResetConsoleFiles() {
+
+	rm -f $MC_DIR/input.con
+	rm -f $MC_DIR/output.con
+	
+	if [ -f $MC_DIR/input.con ]; then
+		echo "$MC_DIR/input.con could not be removed"
+		exit 1
+	fi
+
+       	if [ -f $MC_DIR/output.con ]; then
+                echo "$MC_DIR/output.con could not be removed"
+                exit 1
+        fi
+
+	execCMD "touch $MC_DIR/input.con"
+	execCMD "touch $MC_DIR/output.con"
+
+	if [ ! -f $MC_DIR/input.con ]; then
+		echo "$MC_DIR/input.con could not be created by $MC_USER"
+		exit 1
+	fi
+
+        if [ ! -f $MC_DIR/output.con ]; then
+                echo "$MC_DIR/output.con could not be created by $MC_USER"
+                exit 1
+        fi
+
+}
+
+
+#
+# start the minecraft server
+#
+
+start() {
+   echo -n "Starting minecraft server as user $MC_USER..."
+
+   checkOK 
+
+   ResetConsoleFiles
+
+
+   # be in right working directory when starting 
+   cd $MC_DIR
+
+   execCMD "tail -f --pid=\$$ $MC_DIR/input.con | { $JAVACMD $MC_JAVA_OPS -jar $MC_DIR/$MC_PROC nogui > $MC_DIR/output.con 2>&1 ; kill \$$ ; } " &
+
+   # check if the command wait OK
+
+   if [ $? -ne 0 ]; then
+     echo "Could not start $MC_DIR/$MC_PROC.\n"
+     exit 1
+   fi
+
+   # wait 2 seconds to see if the process survived
+
+   sleep 2
+
+   if [ $(isRunning) -eq 1 ] ; then
+     echo "Started"
+   else
+     echo "stopped again"
+     exit 1
+   fi
+
+}
+
+stop() {
+  local i
+
+  echo -n "Stopping minecraft server..."
+
+  sendCMD "stop"
+
+  # wait for 10 seconds until killing it
+  i=0
+
+  while [ $i -lt 10  -a $(isRunning) -eq 1 ]
+  do
+    echo -n "."
+    sleep 1
+    i=`expr $i + 1`
+  done
+
+  if [ $(isRunning) -eq 1 ] ; then
+     echo -n  "(need to kill it)..."
+     kill  $(getPID)
+     # give it time to die
+     sleep 2
+  fi
+
+  if [ $(isRunning) -eq 1 ] ; then
+     echo "Could not stop it"
+     exit 1
+  else
+     echo "Stopped" 
+  fi
+
+}
+seteula() {
+    
+    # make sure that we have an eula.txt file to modifie
+
+    createEULA
+
+    setProp $MC_DIR/eula.txt "eula" "true"
+
+    echo "EULA accepted"
+
+}
+
+case "$1" in
+
+  start)
+    if [ $(isRunning) -eq 1 ] ; then
+
+	echo -n "$MC_PROC is already running with PID "
+        getPID
+	exit 1
+
+    fi
+    start
+  ;;
+
+  stop)
+    if [ $(isRunning) -eq 1 ] ; then
+       stop
+    else
+      echo "$MC_PROC is not running" 
+    fi
+  ;;
+
+  restart)
+
+     stop
+     start
+  ;;
+
+  create)
+    SVER=$2
+    if [ -z "$SVER" ] ; then
+      SVER="latest"
+    fi
+    echo "Setting version to $SVER"
+
+    buildjar $SVER
+  ;;
+
+  status)
+    if [ $(isRunning) -eq 1 ] ; then
+        echo -n "$MC_PROC is running with PID "
+        getPID
+    else
+	echo "$MC_PROC is not running"
+    fi
+
+  ;;
+
+  accept-eula)
+
+    seteula
+
+  ;;
+  send)
+     sendCMD "$2"
+  ;;
+
+  log)
+     echo "Abort with CTRL-C"
+     tail -f $MC_DIR/output.con
+  ;;
+
+  console)
+
+  ;;
+
+  backup)
+
+  ;;
+
+  *)
+    printf "$USAGE\n"
+    exit 1
+  ;;
+
+esac
+
+exit 0
diff --git a/rootfs/etc/my_runalways/do_build_spigot b/rootfs/etc/my_runalways/do_build_spigot
new file mode 100755
index 00000000..472d57d7
--- /dev/null
+++ b/rootfs/etc/my_runalways/do_build_spigot
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/etc/init.d/minecraft_server create $SPIGOT_VER >> /var/log/startup.log
diff --git a/rootfs/etc/my_runalways/eula b/rootfs/etc/my_runalways/eula
new file mode 100755
index 00000000..c0c3de5e
--- /dev/null
+++ b/rootfs/etc/my_runalways/eula
@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# accept eula if set
+#
+# (c) 2016 nimmis <kjell.havneskold@gmail.com>
+
+if [ ! -z $EULA ] ; then
+  
+  echo "eula=$EULA" > $SPIGOT_HOME/eula.txt
+  chown minecraft $SPIGOT_HOME/eula.txt 
+
+fi 
diff --git a/rootfs/etc/supervisor/conf.d/spigot.conf b/rootfs/etc/supervisor/conf.d/spigot.conf
new file mode 100644
index 00000000..40038ab6
--- /dev/null
+++ b/rootfs/etc/supervisor/conf.d/spigot.conf
@@ -0,0 +1,6 @@
+[program:spigot]
+command=/my_service minecraft_server
+redirect_stderr=true
+autostart=true
+stdout_syslog=true
+
diff --git a/rootfs/usr/local/bin/mc_log b/rootfs/usr/local/bin/mc_log
new file mode 100755
index 00000000..0e7b9610
--- /dev/null
+++ b/rootfs/usr/local/bin/mc_log
@@ -0,0 +1,10 @@
+#!/bin/bash
+###########################################################
+#
+# script to track spigot log
+#
+# (c) 2016 nimmis <kjell.havneskold@gmail.com>
+#
+###########################################################
+
+/etc/init.d/minecraft_server log
diff --git a/rootfs/usr/local/bin/mc_restart b/rootfs/usr/local/bin/mc_restart
new file mode 100755
index 00000000..ddcac3a2
--- /dev/null
+++ b/rootfs/usr/local/bin/mc_restart
@@ -0,0 +1,11 @@
+#!/bin/sh
+###########################################################
+#
+# script to restart spigot process
+#
+# (c) 2016 nimmis <kjell.havneskold@gmail.com>
+#
+###########################################################
+
+supervisorctl restart spigot
+
diff --git a/rootfs/usr/local/bin/mc_send b/rootfs/usr/local/bin/mc_send
new file mode 100755
index 00000000..f393d611
--- /dev/null
+++ b/rootfs/usr/local/bin/mc_send
@@ -0,0 +1,12 @@
+#!/bin/bash
+###########################################################
+#
+# script to send command to spigot
+#
+# (c) 2016 nimmis <kjell.havneskold@gmail.com>
+#
+###########################################################
+
+echo "/etc/init.d/minecraft_server send \"$1\""
+/etc/init.d/minecraft_server send "$1"
+mc_log
diff --git a/rootfs/usr/local/bin/mc_start b/rootfs/usr/local/bin/mc_start
new file mode 100755
index 00000000..87545a26
--- /dev/null
+++ b/rootfs/usr/local/bin/mc_start
@@ -0,0 +1,11 @@
+#!/bin/sh
+###########################################################
+#
+# script to start spigot process
+#
+# (c) 2016 nimmis <kjell.havneskold@gmail.com>
+#
+###########################################################
+
+supervisorctl start spigot
+
diff --git a/rootfs/usr/local/bin/mc_status b/rootfs/usr/local/bin/mc_status
new file mode 100755
index 00000000..683c8c41
--- /dev/null
+++ b/rootfs/usr/local/bin/mc_status
@@ -0,0 +1,11 @@
+#!/bin/sh
+###########################################################
+#
+# script to show status of spigot process
+#
+# (c) 2016 nimmis <kjell.havneskold@gmail.com>
+#
+###########################################################
+
+supervisorctl status spigot
+
diff --git a/rootfs/usr/local/bin/mc_stop b/rootfs/usr/local/bin/mc_stop
new file mode 100755
index 00000000..0029b01f
--- /dev/null
+++ b/rootfs/usr/local/bin/mc_stop
@@ -0,0 +1,11 @@
+#!/bin/sh
+###########################################################
+#
+# script to stop spigot process
+#
+# (c) 2016 nimmis <kjell.havneskold@gmail.com>
+#
+###########################################################
+
+supervisorctl stop spigot
+