diff --git a/package.sh b/package.sh
new file mode 100755
index 000000000..fc5ca91bd
--- /dev/null
+++ b/package.sh
@@ -0,0 +1,365 @@
+#!/usr/bin/env bash
+
+###########################################################################
+# Packaging script which creates debian and RPM packages. It optionally
+# tags the repo with the given version.
+#
+# Requirements: GOPATH must be set. 'fpm' must be on the path, and the AWS
+# CLI tools must also be installed.
+#
+#    https://github.com/jordansissel/fpm
+#    http://aws.amazon.com/cli/
+#
+# Packaging process: to package a build, simple execute:
+#
+#    package.sh <version>
+#
+# where <version> is the desired version. If generation of a debian and RPM
+# package is successful, the script will offer to tag the repo using the
+# supplied version string.
+#
+# AWS upload: the script will also offer to upload the packages to S3. If
+# this option is selected, the credentials should be present in the file
+# ~/aws.conf. The contents should be of the form:
+#
+#    [default]
+#    aws_access_key_id=<access ID>
+#    aws_secret_access_key=<secret key>
+#    region = us-east-1
+#
+# Trim the leading spaces when creating the file. The script will exit if
+# S3 upload is requested, but this file does not exist.
+
+AWS_FILE=~/aws.conf
+
+INSTALL_ROOT_DIR=/opt/influxdb
+TELEGRAF_LOG_DIR=/var/log/influxdb
+CONFIG_ROOT_DIR=/etc/opt/influxdb
+
+SAMPLE_CONFIGURATION=etc/config.sample.toml
+INITD_SCRIPT=scripts/init.sh
+
+TMP_WORK_DIR=`mktemp -d`
+POST_INSTALL_PATH=`mktemp`
+ARCH=`uname -i`
+LICENSE=MIT
+URL=influxdb.com
+MAINTAINER=support@influxdb.com
+VENDOR=Influxdb
+DESCRIPTION="InfluxDB agent"
+PKG_DEPS=(coreutils)
+GO_VERSION="go1.4.2"
+GOPATH_INSTALL=
+BINS=(
+    telegraf
+    )
+
+###########################################################################
+# Helper functions.
+
+# usage prints simple usage information.
+usage() {
+    echo -e "$0 [<version>] [-h]\n"
+    cleanup_exit $1
+}
+
+# cleanup_exit removes all resources created during the process and exits with
+# the supplied returned code.
+cleanup_exit() {
+    rm -r $TMP_WORK_DIR
+    rm $POST_INSTALL_PATH
+    exit $1
+}
+
+# check_gopath sanity checks the value of the GOPATH env variable, and determines
+# the path where build artifacts are installed. GOPATH may be a colon-delimited
+# list of directories.
+check_gopath() {
+    [ -z "$GOPATH" ] && echo "GOPATH is not set." && cleanup_exit 1
+    GOPATH_INSTALL=`echo $GOPATH | cut -d ':' -f 1`
+    [ ! -d "$GOPATH_INSTALL" ] && echo "GOPATH_INSTALL is not a directory." && cleanup_exit 1
+    echo "GOPATH ($GOPATH) looks sane, using $GOPATH_INSTALL for installation."
+}
+
+check_gvm() {
+    source $HOME/.gvm/scripts/gvm
+    which gvm
+    if [ $? -ne 0 ]; then
+        echo "gvm not found -- aborting."
+        cleanup_exit $1
+    fi
+    gvm use $GO_VERSION
+    if [ $? -ne 0 ]; then
+        echo "gvm cannot find Go version $GO_VERSION -- aborting."
+        cleanup_exit $1
+    fi
+}
+
+# check_clean_tree ensures that no source file is locally modified.
+check_clean_tree() {
+    modified=$(git ls-files --modified | wc -l)
+    if [ $modified -ne 0 ]; then
+        echo "The source tree is not clean -- aborting."
+        cleanup_exit 1
+    fi
+    echo "Git tree is clean."
+}
+
+# update_tree ensures the tree is in-sync with the repo.
+update_tree() {
+    git pull origin master
+    if [ $? -ne 0 ]; then
+        echo "Failed to pull latest code -- aborting."
+        cleanup_exit 1
+    fi
+    git fetch --tags
+    if [ $? -ne 0 ]; then
+        echo "Failed to fetch tags -- aborting."
+        cleanup_exit 1
+    fi
+    echo "Git tree updated successfully."
+}
+
+# check_tag_exists checks if the existing release already exists in the tags.
+check_tag_exists () {
+    version=$1
+    git tag | grep -q "^v$version$"
+    if [ $? -eq 0 ]; then
+        echo "Proposed version $version already exists as a tag -- aborting."
+        cleanup_exit 1
+    fi
+}
+
+# make_dir_tree creates the directory structure within the packages.
+make_dir_tree() {
+    work_dir=$1
+    version=$2
+    mkdir -p $work_dir/$INSTALL_ROOT_DIR/versions/$version/scripts
+    if [ $? -ne 0 ]; then
+        echo "Failed to create installation directory -- aborting."
+        cleanup_exit 1
+    fi
+    mkdir -p $work_dir/$CONFIG_ROOT_DIR
+    if [ $? -ne 0 ]; then
+        echo "Failed to create configuration directory -- aborting."
+        cleanup_exit 1
+    fi
+}
+
+
+# do_build builds the code. The version and commit must be passed in.
+do_build() {
+    version=$1
+    commit=`git rev-parse HEAD`
+    if [ $? -ne 0 ]; then
+        echo "Unable to retrieve current commit -- aborting"
+        cleanup_exit 1
+    fi
+
+    for b in ${BINS[*]}; do
+        rm -f $GOPATH_INSTALL/bin/$b
+    done
+    go get -u -f ./...
+    if [ $? -ne 0 ]; then
+        echo "WARNING: failed to 'go get' packages."
+    fi
+    go install -a -ldflags="-X main.Version $version -X main.Commit $commit" ./...
+    if [ $? -ne 0 ]; then
+        echo "Build failed, unable to create package -- aborting"
+        cleanup_exit 1
+    fi
+    echo "Build completed successfully."
+}
+
+# return a list of package dependencies for fpm
+get_fpm_pkg_deps() {
+    local deps=" "
+    for d in ${PKG_DEPS[@]}; do
+      deps="${deps} -d '${d}'"
+    done
+    echo -n ${deps}
+}
+
+# generate_postinstall_script creates the post-install script for the
+# package. It must be passed the version.
+generate_postinstall_script() {
+    version=$1
+    cat  <<EOF >$POST_INSTALL_PATH
+rm -f $INSTALL_ROOT_DIR/telegraf
+rm -f $INSTALL_ROOT_DIR/init.sh
+ln -s $INSTALL_ROOT_DIR/versions/$version/telegraf $INSTALL_ROOT_DIR/telegraf
+ln -s $INSTALL_ROOT_DIR/versions/$version/scripts/init.sh $INSTALL_ROOT_DIR/init.sh
+
+rm -f /etc/init.d/telegraf
+ln -sfn $INSTALL_ROOT_DIR/init.sh /etc/init.d/telegraf
+chmod +x /etc/init.d/telegraf
+if which update-rc.d > /dev/null 2>&1 ; then
+    update-rc.d -f telegraf remove
+    update-rc.d telegraf defaults
+else
+    chkconfig --add telegraf 
+fi
+
+if ! id telegraf >/dev/null 2>&1; then
+        useradd --system -U -M telegraf 
+fi
+chown -R -L telegraf:telegraf $INSTALL_ROOT_DIR
+chmod -R a+rX $INSTALL_ROOT_DIR
+
+mkdir -p $TELEGRAF_LOG_DIR
+chown -R -L telegraf:telegraf $TELEGRAF_LOG_DIR
+EOF
+    echo "Post-install script created successfully at $POST_INSTALL_PATH"
+}
+
+###########################################################################
+# Start the packaging process.
+
+if [ $# -ne 1 ]; then
+    usage 1
+elif [ $1 == "-h" ]; then
+    usage 0
+else
+    VERSION=$1
+fi
+
+echo -e "\nStarting package process...\n"
+
+check_gvm
+check_gopath
+check_clean_tree
+update_tree
+check_tag_exists $VERSION
+do_build $VERSION
+make_dir_tree $TMP_WORK_DIR $VERSION
+
+###########################################################################
+# Copy the assets to the installation directories.
+
+for b in ${BINS[*]}; do
+    cp $GOPATH_INSTALL/bin/$b $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION
+    if [ $? -ne 0 ]; then
+        echo "Failed to copy binaries to packaging directory -- aborting."
+        cleanup_exit 1
+    fi
+done
+
+echo "${BINS[*]} copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION"
+
+cp $INITD_SCRIPT $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION/scripts
+
+if [ $? -ne 0 ]; then
+    echo "Failed to copy init.d script to packaging directory -- aborting."
+    cleanup_exit 1
+fi
+echo "$INITD_SCRIPT copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION/scripts"
+
+cp $SAMPLE_CONFIGURATION $TMP_WORK_DIR/$CONFIG_ROOT_DIR/telegraf.conf
+if [ $? -ne 0 ]; then
+    echo "Failed to copy $SAMPLE_CONFIGURATION to packaging directory -- aborting."
+    cleanup_exit 1
+fi
+
+generate_postinstall_script $VERSION
+
+###########################################################################
+# Create the actual packages.
+
+echo -n "Commence creation of $ARCH packages, version $VERSION? [Y/n] "
+read response
+response=`echo $response | tr 'A-Z' 'a-z'`
+if [ "x$response" == "xn" ]; then
+    echo "Packaging aborted."
+    cleanup_exit 1
+fi
+
+if [ $ARCH == "i386" ]; then
+    rpm_package=telegraf-$VERSION-1.i686.rpm
+    debian_package=telegraf_${VERSION}_i686.deb
+    deb_args="-a i686"
+    rpm_args="setarch i686"
+elif [ $ARCH == "arm" ]; then
+    rpm_package=telegraf-$VERSION-1.armel.rpm
+    debian_package=telegraf_${VERSION}_armel.deb
+else
+    rpm_package=telegraf-$VERSION-1.x86_64.rpm
+    debian_package=telegraf_${VERSION}_amd64.deb
+fi
+
+COMMON_FPM_ARGS="-C $TMP_WORK_DIR --vendor $VENDOR --url $URL --license $LICENSE --maintainer $MAINTAINER --after-install $POST_INSTALL_PATH --name telegraf --version $VERSION --config-files $CONFIG_ROOT_DIR ."
+$rpm_args fpm -s dir -t rpm $(get_fpm_pkg_deps) --description "$DESCRIPTION" $COMMON_FPM_ARGS
+if [ $? -ne 0 ]; then
+    echo "Failed to create RPM package -- aborting."
+    cleanup_exit 1
+fi
+echo "RPM package created successfully."
+
+fpm -s dir -t deb $deb_args $(get_fpm_pkg_deps) --description "$DESCRIPTION" $COMMON_FPM_ARGS
+if [ $? -ne 0 ]; then
+    echo "Failed to create Debian package -- aborting."
+    cleanup_exit 1
+fi
+echo "Debian package created successfully."
+
+###########################################################################
+# Offer to tag the repo.
+
+echo -n "Tag source tree with v$VERSION and push to repo? [y/N] "
+read response
+response=`echo $response | tr 'A-Z' 'a-z'`
+if [ "x$response" == "xy" ]; then
+    echo "Creating tag v$VERSION and pushing to repo"
+    git tag v$VERSION
+    if [ $? -ne 0 ]; then
+        echo "Failed to create tag v$VERSION -- aborting"
+        cleanup_exit 1
+    fi
+    git push origin v$VERSION
+    if [ $? -ne 0 ]; then
+        echo "Failed to push tag v$VERSION to repo -- aborting"
+        cleanup_exit 1
+    fi
+else
+    echo "Not creating tag v$VERSION."
+fi
+
+
+###########################################################################
+# Offer to publish the packages.
+
+echo -n "Publish packages to S3? [y/N] "
+read response
+response=`echo $response | tr 'A-Z' 'a-z'`
+if [ "x$response" == "xy" ]; then
+    echo "Publishing packages to S3."
+    if [ ! -e "$AWS_FILE" ]; then
+        echo "$AWS_FILE does not exist -- aborting."
+        cleanup_exit 1
+    fi
+
+    for filepath in `ls *.{deb,rpm}`; do
+        echo "Uploading $filepath to S3"
+        filename=`basename $filepath`
+        bucket=influxdb
+        echo "Uploading $filename to s3://influxdb/$filename"
+        AWS_CONFIG_FILE=$AWS_FILE aws s3 cp $filepath s3://influxdb/$filename --acl public-read --region us-east-1
+        if [ $? -ne 0 ]; then
+            echo "Upload failed -- aborting".
+            cleanup_exit 1
+        fi
+        echo "Uploading $filename to s3://get.influxdb.org/$filename"
+        AWS_CONFIG_FILE=$AWS_FILE aws s3 cp $filepath s3://get.influxdb.org/$filename --acl public-read --region us-east-1
+        if [ $? -ne 0 ]; then
+            echo "Upload failed -- aborting".
+            cleanup_exit 1
+        fi
+    done
+else
+    echo "Not publishing packages to S3."
+fi
+
+###########################################################################
+# All done.
+
+echo -e "\nPackaging process complete."
+cleanup_exit 0
diff --git a/scripts/init.sh b/scripts/init.sh
new file mode 100755
index 000000000..3e5b239b0
--- /dev/null
+++ b/scripts/init.sh
@@ -0,0 +1,186 @@
+#! /usr/bin/env bash
+
+### BEGIN INIT INFO
+# Provides:          telegraf
+# Required-Start:    $all
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start telegraf at boot time
+### END INIT INFO
+
+# this init script supports three different variations:
+#  1. New lsb that define start-stop-daemon
+#  2. Old lsb that don't have start-stop-daemon but define, log, pidofproc and killproc
+#  3. Centos installations without lsb-core installed
+#
+# In the third case we have to define our own functions which are very dumb
+# and expect the args to be positioned correctly.
+
+# Command-line options that can be set in /etc/default/telegraf.  These will override
+# any config file values.
+TELEGRAF_OPTS=
+
+USER=telegraf
+GROUP=telegraf
+
+if [ -r /lib/lsb/init-functions ]; then
+    source /lib/lsb/init-functions
+fi
+
+DEFAULT=/etc/default/telegraf
+
+if [ -r $DEFAULT ]; then
+    source $DEFAULT
+fi
+
+if [ -z "$STDOUT" ]; then
+    STDOUT=/dev/null
+fi
+if [ ! -f "$STDOUT" ]; then
+    mkdir -p `dirname $STDOUT`
+fi
+
+if [ -z "$STDERR" ]; then
+    STDERR=/var/log/influxdb/telegraf.log
+fi
+if [ ! -f "$STDERR" ]; then
+    mkdir -p `dirname $STDERR`
+fi
+
+
+OPEN_FILE_LIMIT=65536
+
+function pidofproc() {
+    if [ $# -ne 3 ]; then
+        echo "Expected three arguments, e.g. $0 -p pidfile daemon-name"
+    fi
+
+    pid=`pgrep -f $3`
+    local pidfile=`cat $2`
+
+    if [ "x$pidfile" == "x" ]; then
+        return 1
+    fi
+
+    if [ "x$pid" != "x" -a "$pidfile" == "$pid" ]; then
+        return 0
+    fi
+
+    return 1
+}
+
+function killproc() {
+    if [ $# -ne 3 ]; then
+        echo "Expected three arguments, e.g. $0 -p pidfile signal"
+    fi
+
+    pid=`cat $2`
+
+    kill -s $3 $pid
+}
+
+function log_failure_msg() {
+    echo "$@" "[ FAILED ]"
+}
+
+function log_success_msg() {
+    echo "$@" "[ OK ]"
+}
+
+# Process name ( For display )
+name=telegraf
+
+# Daemon name, where is the actual executable
+daemon=/opt/influxdb/telegraf
+
+# pid file for the daemon
+pidfile=/var/run/influxdb/telegraf.pid
+piddir=`dirname $pidfile`
+
+if [ ! -d "$piddir" ]; then
+    mkdir -p $piddir
+    chown $GROUP:$USER $piddir
+fi
+
+# Configuration file
+config=/etc/opt/influxdb/telegraf.conf
+
+# If the daemon is not there, then exit.
+[ -x $daemon ] || exit 5
+
+case $1 in
+    start)
+        # Checked the PID file exists and check the actual status of process
+        if [ -e $pidfile ]; then
+            pidofproc -p $pidfile $daemon > /dev/null 2>&1 && status="0" || status="$?"
+            # If the status is SUCCESS then don't need to start again.
+            if [ "x$status" = "x0" ]; then
+                log_failure_msg "$name process is running"
+                exit 0 # Exit
+            fi
+        fi
+
+        # Bump the file limits, before launching the daemon. These will carry over to
+        # launched processes.
+        ulimit -n $OPEN_FILE_LIMIT
+        if [ $? -ne 0 ]; then
+            log_failure_msg "set open file limit to $OPEN_FILE_LIMIT"
+        fi
+
+        log_success_msg "Starting the process" "$name"
+        if which start-stop-daemon > /dev/null 2>&1; then
+            start-stop-daemon --chuid $GROUP:$USER --start --quiet --pidfile $pidfile --exec $daemon -- -pidfile $pidfile -config $config $TELEGRAF_OPTS >>$STDOUT 2>>$STDERR &
+        else
+            nohup $daemon -pidfile $pidfile -config $config $TELEGRAF_OPTS >>$STDOUT 2>>$STDERR &
+        fi
+        log_success_msg "$name process was started"
+        ;;
+
+    stop)
+        # Stop the daemon.
+        if [ -e $pidfile ]; then
+            pidofproc -p $pidfile $daemon > /dev/null 2>&1 && status="0" || status="$?"
+            if [ "$status" = 0 ]; then
+                if killproc -p $pidfile SIGTERM && /bin/rm -rf $pidfile; then
+                    log_success_msg "$name process was stopped"
+                else
+                    log_failure_msg "$name failed to stop service"
+                fi
+            fi
+        else
+            log_failure_msg "$name process is not running"
+        fi
+        ;;
+
+    restart)
+        # Restart the daemon.
+        $0 stop && sleep 2 && $0 start
+        ;;
+
+    status)
+        # Check the status of the process.
+        if [ -e $pidfile ]; then
+            if pidofproc -p $pidfile $daemon > /dev/null; then
+                log_success_msg "$name Process is running"
+                exit 0
+            else
+                log_failure_msg "$name Process is not running"
+                exit 1
+            fi
+        else
+            log_failure_msg "$name Process is not running"
+            exit 3
+        fi
+        ;;
+
+    version)
+        $daemon version
+        ;;
+
+    *)
+        # For invalid arguments, print the usage message.
+        echo "Usage: $0 {start|stop|restart|status|version}"
+        exit 2
+        ;;
+esac