diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf
index b6498acbbd6..e471a6c26a9 100644
--- a/src/upstart/ceph-osd.conf
+++ b/src/upstart/ceph-osd.conf
@@ -15,14 +15,15 @@ pre-start script
     # update location in crush; put in some suitable defaults on the
     # command line, ceph.conf can override what it wants
     location="$(ceph-conf --cluster="${cluster:-ceph}" --name="osd.$id" --lookup osd_crush_location || :)"
-    weight="$(ceph-conf --cluster="$cluster" --name="osd.$id" --lookup osd_crush_weight || :)"
+    weight="$(ceph-conf --cluster="$cluster" --name="osd.$id" --lookup osd_crush_initial_weight || :)"
     ceph \
         --cluster="${cluster:-ceph}" \
         --name="osd.$id" \
         --keyring="/var/lib/ceph/osd/${cluster:-ceph}-$id/keyring" \
-        osd crush set \
+        osd crush create-or-move \
 	-- \
-        "$id" "osd.$id" "${weight:-1}" \
+        "$id" \
+	"${weight:-1}" \
 	root=default \
 	host="$(hostname -s)" \
 	$location \