diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21a4c25c527..4a5b05271b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - [#2147](https://github.com/influxdb/influxdb/pull/2147): Set Go Max procs in a better location
 - [#2151](https://github.com/influxdb/influxdb/pull/2151): Ignore replay commands on the metastore.
 - [#2156](https://github.com/influxdb/influxdb/pull/2156): Propagate error when resolving UDP address in Graphite UDP server.
+- [#2163](https://github.com/influxdb/influxdb/pull/2163): Fix up paths for default data and run storage.
 
 ## v0.9.0-rc19 [2015-04-01]
 
diff --git a/etc/config.sample.toml b/etc/config.sample.toml
index 9624093d4dc..43754209336 100644
--- a/etc/config.sample.toml
+++ b/etc/config.sample.toml
@@ -63,13 +63,13 @@ enabled = false
 # consensus.
 [broker]
 # Where the Raft logs are stored. The user running InfluxDB will need read/write access.
-dir  = "/tmp/influxdb/development/raft"
+dir  = "/var/opt/influxdb/raft"
 port = 8086
 
 # Data node configuration. Data nodes are where the time-series data, in the form of
 # shards, is stored.
 [data]
-  dir = "/tmp/influxdb/development/db"
+  dir = "/var/opt/influxdb/db"
   port = 8086
 
   # Auto-create a retention policy when a database is created. Defaults to true.
@@ -82,7 +82,7 @@ port = 8086
 
 [cluster]
 # Location for cluster state storage. For storing state persistently across restarts.
-dir = "/tmp/influxdb/development/state"
+dir = "/var/opt/influxdb/state"
 
 # Configuration for snapshot endpoint.
 [snapshot]
diff --git a/package.sh b/package.sh
index 8242c48ed09..19ff56e6cd4 100755
--- a/package.sh
+++ b/package.sh
@@ -33,8 +33,9 @@
 AWS_FILE=~/aws.conf
 
 INSTALL_ROOT_DIR=/opt/influxdb
-INFLUXDB_RUN_DIR=/var/opt/influxdb
+INFLUXDB_RUN_DIR=/var/run/influxdb
 INFLUXDB_LOG_DIR=/var/log/influxdb
+INFLUXDB_DATA_DIR=/var/opt/influxdb
 CONFIG_ROOT_DIR=/etc/opt/influxdb
 
 SAMPLE_CONFIGURATION=etc/config.sample.toml
@@ -186,6 +187,8 @@ mkdir -p $INFLUXDB_RUN_DIR
 chown -R -L influxdb:influxdb $INFLUXDB_RUN_DIR
 mkdir -p $INFLUXDB_LOG_DIR
 chown -R -L influxdb:influxdb $INFLUXDB_LOG_DIR
+mkdir -p $INFLUXDB_DATA_DIR
+chown -R -L influxdb:influxdb $INFLUXDB_DATA_DIR
 EOF
     echo "Post-install script created successfully at $POST_INSTALL_PATH"
 }
diff --git a/scripts/init.sh b/scripts/init.sh
index 69f600924a8..64eff707cab 100755
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -88,7 +88,7 @@ name=influxd
 daemon=/opt/influxdb/influxd
 
 # pid file for the daemon
-pidfile=/var/opt/influxdb/run/influxd.pid
+pidfile=/var/run/influxdb/influxd.pid
 
 # Configuration file
 config=/etc/opt/influxdb/influxdb.conf