diff --git a/core/linux-oak/PKGBUILD b/core/linux-oak/PKGBUILD
index 8b8b7bfeb..fc94b70c4 100644
--- a/core/linux-oak/PKGBUILD
+++ b/core/linux-oak/PKGBUILD
@@ -7,8 +7,8 @@ pkgbase=linux-oak
 _kernelname=${pkgbase#linux}
 _desc="Oak Chromebooks"
 pkgver=3.18.0
-pkgrel=11
-_commit=5fe5d5aecd795dc5056440c6e401989eeac5d47c
+pkgrel=12
+_commit=77d2e2c6c87c0d38b7849b210563d856c04e3daf
 arch=('aarch64')
 url="https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-3.18"
 license=('GPL2')
@@ -33,7 +33,7 @@ source=("https://chromium.googlesource.com/chromiumos/third_party/kernel/+archiv
         'kernel.keyblock'
         'kernel_data_key.vbprivk'
         'cmdline')
-md5sums=('a8f05f181b203eb0b7181a1c758f0d02'
+md5sums=('4418c3dbc04b603215dea1e4d114269d'
          'b0245f5b0ffd211ef356c3938bb9691d'
          '1ff1d92e5506ea3b150e286a1791cae3'
          '44325bb24aef330147e2fa2057a00a4a'
@@ -47,7 +47,7 @@ md5sums=('a8f05f181b203eb0b7181a1c758f0d02'
          '3c24f23d6c47e9b13739dba603b2d9e0'
          '9a5ed78ec0a28e646538dc17ca744b61'
          '54c0375c456bc7ef03f5ad2a39915044'
-         'ee8aa1e9419470262f6307cc876bc94a'
+         '021b7e80b26e75e56aa17ebb1637ea3c'
          'aef13cb59516e9313cb8947350f717d6'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
diff --git a/core/linux-oak/config b/core/linux-oak/config
index aabd50bf8..768957521 100644
--- a/core/linux-oak/config
+++ b/core/linux-oak/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 3.18.0-11 Kernel Configuration
+# Linux/arm64 3.18.0-12 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -2482,7 +2482,8 @@ CONFIG_WATCHDOG_CORE=y
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ARM_SP805_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
-CONFIG_MEDIATEK_WATCHDOG=y
+# CONFIG_MEDIATEK_WATCHDOG is not set
+CONFIG_SMC_WATCHDOG=y
 # CONFIG_MEN_A21_WDT is not set
 
 #