diff --git a/build_library/dev_image_util.sh b/build_library/dev_image_util.sh
index 823fdc6a90..93c128177a 100755
--- a/build_library/dev_image_util.sh
+++ b/build_library/dev_image_util.sh
@@ -93,7 +93,7 @@ EOF
 
   # Remount the system partition read-write by default.
   # The remount services are provided by coreos-base/coreos-init
-  systemd_enable "${root_fs_dir}" "local-fs.target" "remount-usr.service"
+  systemd_enable "${root_fs_dir}" "multi-user.target" "remount-usr.service"
 
   finish_image "${disk_layout}" "${root_fs_dir}" "${image_contents}"
   upload_image -d "${BUILD_DIR}/${image_name}.bz2.DIGESTS" \
diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release
index 77ad646ab4..e2b996cdfd 100755
--- a/build_library/set_lsb_release
+++ b/build_library/set_lsb_release
@@ -40,7 +40,7 @@ sudo ln -sf "../usr/share/coreos/lsb-release" "${ROOT_FS_DIR}/etc/lsb-release"
 # Aaaannd for the new systemd world order
 # os-release provides a separate build-id field, so split it from version
 OS_ID=$(tr '[:upper:]' '[:lower:]' <<<"$COREOS_VERSION_NAME")
-sudo_clobber "${ROOT_FS_DIR}/usr/share/coreos/os-release" <<EOF
+sudo_clobber "${ROOT_FS_DIR}/usr/lib/os-release" <<EOF
 NAME=$COREOS_VERSION_NAME
 ID=$OS_ID
 VERSION=$COREOS_VERSION_STRING
@@ -51,7 +51,8 @@ ANSI_COLOR="1;32"
 HOME_URL="https://coreos.com/"
 BUG_REPORT_URL="https://github.com/coreos/bugs/issues"
 EOF
-sudo ln -sf "../usr/share/coreos/os-release" "${ROOT_FS_DIR}/etc/os-release"
+sudo ln -sf "../usr/lib/os-release" "${ROOT_FS_DIR}/etc/os-release"
+sudo ln -sf "../../lib/os-release" "${ROOT_FS_DIR}/usr/share/coreos/os-release"
 
 # Create the defaults for the coreos configuration files in the usr directory
 sudo_clobber "${ROOT_FS_DIR}/usr/share/coreos/release" <<EOF