diff --git a/chroot_version_hooks.d/127_rengenerate_board_config_lakitu b/chroot_version_hooks.d/127_rengenerate_board_config_lakitu
new file mode 100644
index 0000000..18eb41b
--- /dev/null
+++ b/chroot_version_hooks.d/127_rengenerate_board_config_lakitu
@@ -0,0 +1,11 @@
+# Copyright 2015 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.
+
+# We switched lakitu from make.conf to make.defaults
+# This broke incremental builds because make.conf.board still points to the
+# non-existent make.conf
+if [ -d /build/lakitu ]; then
+  ~/trunk/src/scripts/setup_board --board lakitu --skip_chroot_upgrade \
+      --regen_configs
+fi