diff --git a/Makefile b/Makefile
index ebd9865..6229995 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,8 @@
 	install -m 0755 cros_run_unit_tests "${DESTDIR}/usr/bin"
 	install -m 0755 run_remote_tests.sh ${DESTDIR}/usr/bin
 	install -m 0755 test_that ${DESTDIR}/usr/bin
+	install -m 0755 bootperf-wrapper ${DESTDIR}/usr/bin/bootperf
+	ln ${DESTDIR}/usr/bin/bootperf ${DESTDIR}/usr/bin/showbootdata
 	install -m 0644 unit_test_black_list.txt \
 		"${DESTDIR}/usr/share/crostestutils"
 	install -m 0755 utils_py/generate_test_report.py \
diff --git a/bootperf-wrapper b/bootperf-wrapper
new file mode 100755
index 0000000..c35fa59
--- /dev/null
+++ b/bootperf-wrapper
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTOTEST=/mnt/host/source/src/third_party/autotest/files
+SCR=$AUTOTEST/site_utils/bootperf-bin/$(basename $0)
+
+if [ ! -f $SCR ]; then
+  echo "You appear to have a minilayout checkout, without the autotest"
+  echo "repository in your source tree. Aborting."
+  exit 1
+fi
+
+exec $SCR "$@"