diff --git a/configs/kwikstik-k40/README.txt b/configs/kwikstik-k40/README.txt
index ef0bdbf77c..3c58a89738 100644
--- a/configs/kwikstik-k40/README.txt
+++ b/configs/kwikstik-k40/README.txt
@@ -253,68 +253,56 @@ KwikStik-K40-specific Configuration Options
 	   the delay actually is 100 seconds.
 
   Individual subsystems can be enabled:
-	AHB
-	---
-	CONFIG_KINETIS_DMA1
-	CONFIG_KINETIS_DMA2
-	CONFIG_KINETIS_CRC
-	CONFIG_KINETIS_FSMC
-	CONFIG_KINETIS_SDIO
 
-	APB1
-	----
-	CONFIG_KINETIS_TIM2
-	CONFIG_KINETIS_TIM3
-	CONFIG_KINETIS_TIM4
-	CONFIG_KINETIS_TIM5
-	CONFIG_KINETIS_TIM6
-	CONFIG_KINETIS_TIM7
-	CONFIG_KINETIS_WWDG
-	CONFIG_KINETIS_SPI2
-	CONFIG_KINETIS_SPI4
-	CONFIG_KINETIS_USART2
-	CONFIG_KINETIS_USART3
-	CONFIG_KINETIS_UART4
-	CONFIG_KINETIS_UART5
-	CONFIG_KINETIS_I2C1
-	CONFIG_KINETIS_I2C2
-	CONFIG_KINETIS_USB
-	CONFIG_KINETIS_CAN
-	CONFIG_KINETIS_BKP
-	CONFIG_KINETIS_PWR
-	CONFIG_KINETIS_DAC
-	CONFIG_KINETIS_USB
-
-	APB2
-	----
-	CONFIG_KINETIS_ADC1
-	CONFIG_KINETIS_ADC2
-	CONFIG_KINETIS_TIM1
-	CONFIG_KINETIS_SPI1
-	CONFIG_KINETIS_TIM8
-	CONFIG_KINETIS_USART1
-	CONFIG_KINETIS_ADC3
-
-  Alternate pin mappings (should not be used with the KwikStik-K40 board):
-
-	CONFIG_KINETIS_TIM1_FULL_REMAP
-	CONFIG_KINETIS_TIM1_PARTIAL_REMAP
-	CONFIG_KINETIS_TIM2_FULL_REMAP
-	CONFIG_KINETIS_TIM2_PARTIAL_REMAP_1
-	CONFIG_KINETIS_TIM2_PARTIAL_REMAP_2
-	CONFIG_KINETIS_TIM3_FULL_REMAP
-	CONFIG_KINETIS_TIM3_PARTIAL_REMAP
-	CONFIG_KINETIS_TIM4_REMAP
-	CONFIG_KINETIS_USART1_REMAP
-	CONFIG_KINETIS_USART2_REMAP
-	CONFIG_KINETIS_USART3_FULL_REMAP
-	CONFIG_KINETIS_USART3_PARTIAL_REMAP
-	CONFIG_KINETIS_SPI1_REMAP
-	CONFIG_KINETIS_SPI3_REMAP
-	CONFIG_KINETIS_I2C1_REMAP
-	CONFIG_KINETIS_CAN1_FULL_REMAP
-	CONFIG_KINETIS_CAN1_PARTIAL_REMAP
-	CONFIG_KINETIS_CAN2_REMAP
+  	CONFIG_KINETIS_UART0
+  	CONFIG_KINETIS_UART1
+  	CONFIG_KINETIS_UART2
+  	CONFIG_KINETIS_UART3
+  	CONFIG_KINETIS_UART4
+  	CONFIG_KINETIS_UART5
+  	CONFIG_KINETIS_ETHERNET (K60 only)
+  	CONFIG_KINETIS_RNGB (K60 only)
+    CONFIG_KINETIS_FLEXCAN0
+    CONFIG_KINETIS_FLEXCAN1
+    CONFIG_KINETIS_SPI0
+    CONFIG_KINETIS_SPI1
+    CONFIG_KINETIS_SPI2
+    CONFIG_KINETIS_I2C0
+    CONFIG_KINETIS_I2C1
+    CONFIG_KINETIS_I2S
+  	CONFIG_KINETIS_DAC0
+  	CONFIG_KINETIS_DAC1
+    CONFIG_KINETIS_ADC0
+    CONFIG_KINETIS_ADC1
+    CONFIG_KINETIS_CMP
+    CONFIG_KINETIS_VREF
+    CONFIG_KINETIS_SDHC
+    CONFIG_KINETIS_FTM0
+    CONFIG_KINETIS_FTM1
+    CONFIG_KINETIS_FTM2
+    CONFIG_KINETIS_LPTIMER
+    CONFIG_KINETIS_RTC
+    CONFIG_KINETIS_SLCD (K40 only)
+    CONFIG_KINETIS_EWM
+    CONFIG_KINETIS_CMT
+    CONFIG_KINETIS_USBOTG
+    CONFIG_KINETIS_USBDCD
+    CONFIG_KINETIS_LLWU
+    CONFIG_KINETIS_REGFILE
+    CONFIG_KINETIS_TSI
+    CONFIG_KINETIS_PORTA
+    CONFIG_KINETIS_PORTB
+    CONFIG_KINETIS_PORTC
+    CONFIG_KINETIS_PORTD
+    CONFIG_KINETIS_PORTE
+    CONFIG_KINETIS_FTFL
+    CONFIG_KINETIS_DMA
+    CONFIG_KINETIS_DMAMUX
+    CONFIG_KINETIS_CRC
+    CONFIG_KINETIS_PDB
+    CONFIG_KINETIS_PIT
+    CONFIG_KINETIS_FLEXBUS
+    CONFIG_KINETIS_MPU
 
   Kinetis K40 specific device driver settings