diff --git a/devices/motorola-potter/kernel/config.aarch64 b/devices/motorola-potter/kernel/config.aarch64
index 0c4fec48..353f28ea 100644
--- a/devices/motorola-potter/kernel/config.aarch64
+++ b/devices/motorola-potter/kernel/config.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 3.18.113 Kernel Configuration
+# Linux/arm64 3.18.140 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -148,7 +148,7 @@ CONFIG_SCHED_HMP=y
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
+CONFIG_USER_NS=y
 # CONFIG_PID_NS is not set
 CONFIG_NET_NS=y
 # CONFIG_SCHED_AUTOGROUP is not set
@@ -219,6 +219,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_THREAD_INFO_ALLOCATOR=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
@@ -443,10 +444,12 @@ CONFIG_PGTABLE_MAPPING=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_BALANCE_ANON_FILE_RECLAIM is not set
-CONFIG_KSWAPD_CPU_AFFINITY_MASK="f"
+CONFIG_KSWAPD_CPU_AFFINITY_MASK=""
 # CONFIG_FORCE_ALLOC_FROM_DMA_ZONE is not set
 CONFIG_PROCESS_RECLAIM=y
+# CONFIG_FORCE_RECLAIM is not set
 CONFIG_VM_MAX_READAHEAD=2048
+CONFIG_DEFAULT_SWAPPINESS=60
 CONFIG_SECCOMP=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
@@ -489,6 +492,7 @@ CONFIG_COREDUMP=y
 # CONFIG_COREDUMP_PERMISSION_HACK is not set
 CONFIG_COMPAT=y
 CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
 
 #
 # Power management options
@@ -964,10 +968,6 @@ CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 # CONFIG_MTD_UBI is not set
 CONFIG_DTC=y
 CONFIG_OF=y
-
-#
-# Device Tree and Open Firmware support
-#
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_EARLY_FLATTREE=y
@@ -1060,8 +1060,6 @@ CONFIG_DROPBOX=y
 # CONFIG_USB3813 is not set
 # CONFIG_FSUSB42_MUX is not set
 CONFIG_DTV_FC8300=y
-# CONFIG_V4L2_HAL is not set
-# CONFIG_MOD_GREYBUS is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -1691,6 +1689,8 @@ CONFIG_TOUCHSCREEN_GEN_VKEYS=y
 # CONFIG_TOUCHSCREEN_MAXIM_STI is not set
 # CONFIG_TOUCHSCREEN_HIMAX_CHIPSET is not set
 CONFIG_TOUCHSCREEN_NT36xxx=y
+# CONFIG_TOUCHSCREEN_ILITEK is not set
+# CONFIG_TOUCHSCREEN_FTS is not set
 CONFIG_SCREEN_OFF_GESTURES=y
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
@@ -1705,6 +1705,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
 # CONFIG_INPUT_ATI_REMOTE2 is not set
 CONFIG_INPUT_KEYCHORD=y
+# CONFIG_STMVL53L0X is not set
 # CONFIG_INPUT_KEYSPAN_REMOTE is not set
 # CONFIG_INPUT_KXTJ9 is not set
 # CONFIG_INPUT_POWERMATE is not set
@@ -1740,6 +1741,16 @@ CONFIG_EPL8802=y
 # CONFIG_EPL8802_ALSPS is not set
 # CONFIG_LTR559 is not set
 # CONFIG_INPUT_MXG3300 is not set
+# CONFIG_BOSCH_DRIVER_LOG_FUNC is not set
+# CONFIG_SENSORS_SMI_ACC2X2 is not set
+# CONFIG_SENSORS_SMI_GYRO is not set
+# CONFIG_SENSORS_YAS537 is not set
+# CONFIG_SENSORS_BMM050 is not set
+# CONFIG_SENSORS_AKM09912 is not set
+# CONFIG_SENSORS_SMI_ACC420 is not set
+# CONFIG_SENSORS_SMI_ACC421 is not set
+# CONFIG_SENSORS_SMI_ACC422 is not set
+# CONFIG_SENSORS_SMI_ACC455 is not set
 
 #
 # Hardware I/O ports
@@ -1773,6 +1784,7 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_NOZOMI is not set
 # CONFIG_N_GSM is not set
 # CONFIG_TRACE_SINK is not set
+CONFIG_LDISC_AUTOLOAD=y
 # CONFIG_DEVMEM is not set
 # CONFIG_DEVKMEM is not set
 
@@ -1834,7 +1846,6 @@ CONFIG_DIAG_OVER_TTY=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_MSM_LEGACY=y
-# CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 
 #
@@ -2576,6 +2587,7 @@ CONFIG_MSM_SEC_CCI_TA_NAME="seccamdemo64"
 CONFIG_QPNP_FLASH_STROBE_OVERRIDE=y
 # CONFIG_MOT_CAMERA_ALT_CLOCKS is not set
 # CONFIG_MOT_CAMERA_ALT_MIPI_TERMINAL_ENABLE is not set
+# CONFIG_MULTI_CAMERA_DEEN is not set
 # CONFIG_MSM_AIS is not set
 # CONFIG_TSPP is not set
 CONFIG_MSM_SDE_ROTATOR=y
@@ -2785,6 +2797,7 @@ CONFIG_FB_MSM_MDSS=y
 CONFIG_FB_MSM_MDSS_WRITEBACK=y
 CONFIG_FB_MSM_MDSS_HDMI_PANEL=y
 # CONFIG_FB_MSM_MDSS_HDMI_MHL_SII8334 is not set
+# CONFIG_FB_MSM_MDSS_SPI_PANEL is not set
 # CONFIG_FB_MSM_MDSS_MHL3 is not set
 # CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS is not set
 # CONFIG_FB_MSM_MDSS_EDP_PANEL is not set
@@ -2974,6 +2987,7 @@ CONFIG_DTS_SRS_TM=y
 CONFIG_QTI_PP=y
 CONFIG_SND_SOC_CPE=y
 # CONFIG_SND_SOC_OPALUM is not set
+# CONFIG_SND_SOC_MSM8996_VM is not set
 CONFIG_SND_SOC_MSM8X16=y
 # CONFIG_SND_CS35L35_I2C2 is not set
 # CONFIG_SND_CS35L35_QUAT_I2S is not set
@@ -3046,6 +3060,7 @@ CONFIG_SND_SOC_WCD_MBHC=y
 # CONFIG_SND_SOC_WM8978 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SOC_MSM_STUB=y
+# CONFIG_SND_SOC_TFA9874 is not set
 CONFIG_SND_SOC_MSM_HDMI_DBA_CODEC_RX=y
 # CONFIG_SND_SIMPLE_CARD is not set
 # CONFIG_SOUND_PRIME is not set
@@ -3460,6 +3475,7 @@ CONFIG_LEDS_ISL98611=y
 # CONFIG_LEDS_LP8501 is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA9956B is not set
 CONFIG_LEDS_ATC=y
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_PWM is not set
@@ -3763,6 +3779,7 @@ CONFIG_STAGING=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 CONFIG_ASHMEM=y
 # CONFIG_ANDROID_LOGGER is not set
 CONFIG_ANDROID_TIMED_OUTPUT=y
@@ -3775,6 +3792,7 @@ CONFIG_SW_SYNC=y
 # CONFIG_SW_SYNC_USER is not set
 CONFIG_ONESHOT_SYNC=y
 # CONFIG_ONESHOT_SYNC_USER is not set
+# CONFIG_ANDROID_VSOC is not set
 CONFIG_ION=y
 # CONFIG_ION_TEST is not set
 # CONFIG_ION_DUMMY is not set
@@ -3782,7 +3800,6 @@ CONFIG_ION_MSM=y
 # CONFIG_ALLOC_BUFFERS_IN_4K_CHUNKS is not set
 # CONFIG_FIQ_DEBUGGER is not set
 # CONFIG_FIQ_WATCHDOG is not set
-# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # CONFIG_USB_WPAN_HCD is not set
 # CONFIG_WIMAX_GDM72XX is not set
 # CONFIG_LTE_GDM724X is not set
@@ -3827,7 +3844,6 @@ CONFIG_IPA=y
 # CONFIG_IPA3 is not set
 # CONFIG_GSI is not set
 CONFIG_RMNET_IPA=y
-# CONFIG_SSM is not set
 # CONFIG_MSM_MHI is not set
 # CONFIG_PFT is not set
 # CONFIG_I2C_MSM_PROF_DBG is not set
@@ -3965,6 +3981,7 @@ CONFIG_MSM_EVENT_TIMER=y
 # CONFIG_MSM_IPC_ROUTER_GLINK_XPRT is not set
 # CONFIG_MSM_SYSTEM_HEALTH_MONITOR is not set
 # CONFIG_MSM_GLINK_PKT is not set
+# CONFIG_MSM_BGRSB is not set
 CONFIG_MSM_TZ_SMMU=y
 CONFIG_MSM_SUBSYSTEM_RESTART=y
 CONFIG_MSM_SYSMON_COMM=y
@@ -3981,10 +3998,12 @@ CONFIG_POTTER_DTB=y
 # CONFIG_ALBUS_DTB is not set
 # CONFIG_JOHNSON_DTB is not set
 # CONFIG_ALI_DTB is not set
+# CONFIG_DEEN_DTB is not set
 # CONFIG_CEDRIC_DTB is not set
 # CONFIG_MONTANA_DTB is not set
 # CONFIG_PERRY_DTB is not set
 # CONFIG_JAMES_DTB is not set
+# CONFIG_PETTYL_DTB is not set
 # CONFIG_NORA_DTB is not set
 # CONFIG_JETER_DTB is not set
 # CONFIG_OWENS_DTB is not set
@@ -4005,6 +4024,7 @@ CONFIG_MSM_KERNEL_PROTECT_MPU=y
 # CONFIG_MSM_REMOTEQDSS is not set
 # CONFIG_QCOM_SMCINVOKE is not set
 # CONFIG_QCOM_EARLY_RANDOM is not set
+# CONFIG_MSM_BG_GLINK is not set
 # CONFIG_WCD_DSP_GLINK is not set
 CONFIG_MEM_SHARE_QMI_SERVICE=y
 CONFIG_BOOTINFO=y
@@ -4156,7 +4176,11 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # Inertial measurement units
 #
 # CONFIG_SENSORS_BMI160_IIO is not set
+# CONFIG_INV_MPU_IIO_I2C is not set
+# CONFIG_INV_MPU_IIO_SPI is not set
 # CONFIG_INV_MPU9250_IIO is not set
+# CONFIG_INV_ICM20602_IIO is not set
+# CONFIG_IIO_ST_ASM330LHH is not set
 
 #
 # Light sensors
@@ -4263,7 +4287,6 @@ CONFIG_EFI_ARMSTUB=y
 CONFIG_MSM_TZ_LOG=y
 # CONFIG_MSM_TZ_LOG_WDOG_DUMP is not set
 # CONFIG_BIF is not set
-# CONFIG_TRUSTONIC_TEE is not set
 
 #
 # Firmware Drivers
@@ -4357,7 +4380,9 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_AFFS_FS is not set
 CONFIG_ECRYPT_FS=y
 CONFIG_ECRYPT_FS_MESSAGING=y
-# CONFIG_SDCARD_FS is not set
+CONFIG_SDCARD_FS=y
+# CONFIG_SDCARD_FS_PARTIAL_RELATIME is not set
+# CONFIG_SDCARD_FS_DIR_WRITER is not set
 # CONFIG_MULTISPACE_FEATURE_ENABLED is not set
 # CONFIG_ESD_FS is not set
 # CONFIG_HFS_FS is not set
@@ -4390,6 +4415,7 @@ CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FS_ENCRYPTION is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_EFIVAR_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NFS_FS is not set
@@ -4634,7 +4660,6 @@ CONFIG_EARLY_PRINTK=y
 # Security options
 #
 CONFIG_KEYS=y
-CONFIG_KEYS_COMPAT=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 # CONFIG_ENCRYPTED_KEYS is not set
@@ -4724,7 +4749,7 @@ CONFIG_CRYPTO_XCBC=y
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32 is not set
+CONFIG_CRYPTO_CRC32=y
 # CONFIG_CRYPTO_CRCT10DIF is not set
 # CONFIG_CRYPTO_GHASH is not set
 CONFIG_CRYPTO_MD4=y
@@ -4756,6 +4781,8 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SPECK is not set
+# CONFIG_CRYPTO_SPECK_NEON is not set
 # CONFIG_CRYPTO_TEA is not set
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_TWOFISH_COMMON=y
@@ -4791,6 +4818,10 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_PUBLIC_KEY_ALGO_RSA=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 # CONFIG_PKCS7_MESSAGE_PARSER is not set
+
+#
+# Certificates for signature checking
+#
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
diff --git a/devices/motorola-potter/kernel/default.nix b/devices/motorola-potter/kernel/default.nix
index 904dec08..7655eaa6 100644
--- a/devices/motorola-potter/kernel/default.nix
+++ b/devices/motorola-potter/kernel/default.nix
@@ -7,14 +7,14 @@
 
 
 mobile-nixos.kernel-builder-gcc6 {
-  version = "3.18.113";
+  version = "3.18.140";
   configfile = ./config.aarch64;
 
   src = fetchFromGitHub {
     owner = "boulzordev";
     repo = "android_kernel_motorola_msm8953";
-    rev = "efeb95ed634079eb520922f6f78f16f9d967a6d4";
-    sha256 = "03xmlyq06fvn0v4nvrs2nhmb88axg45ccd1vb3nam6jj1381zv4w";
+    rev = "32b6f05688ff51e54958a8e97df24cd63a62b880";
+    sha256 = "0r0xkf6cq60bvckn311k43yxrm0qjp9psi6g3jfc6l5z4k549glm";
   };
 
   patches = [