diff --git a/recipes-kernel/linux/linux-wandboard-3.0.35/defconfig b/recipes-kernel/linux/linux-wandboard-3.0.35/defconfig
index 2e443c6..717ff73 100644
--- a/recipes-kernel/linux/linux-wandboard-3.0.35/defconfig
+++ b/recipes-kernel/linux/linux-wandboard-3.0.35/defconfig
@@ -1,5 +1,5 @@
 CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION="-wandboard+yocto"
 CONFIG_KERNEL_LZMA=y
 CONFIG_DEFAULT_HOSTNAME="wandboard"
 CONFIG_SYSVIPC=y
@@ -9,7 +9,6 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_BUG is not set
 # CONFIG_ELF_CORE is not set
-CONFIG_ASHMEM=y
 # CONFIG_AIO is not set
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
@@ -28,13 +27,11 @@ CONFIG_MACH_WANDBOARD=y
 CONFIG_IMX_PCIE=y
 CONFIG_USB_EHCI_ARC_H1=y
 CONFIG_USB_FSL_ARC_OTG=y
-# CONFIG_ISP1504_MXC is not set
 CONFIG_DMA_ZONE_SIZE=96
 CONFIG_ARM_THUMBEE=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_ARM_ERRATA_743622=y
 CONFIG_ARM_ERRATA_753970=y
-CONFIG_PCIEPORTBUS=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_SMP=y
@@ -44,7 +41,6 @@ CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 CONFIG_COMPACTION=y
 CONFIG_KSM=y
-CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
@@ -69,8 +65,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
-# CONFIG_ANDROID_PARANOID_NETWORK is not set
-# CONFIG_NET_ACTIVITY_STATS is not set
 CONFIG_BT=y
 CONFIG_BT_L2CAP=y
 CONFIG_BT_SCO=y
@@ -89,17 +83,19 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
-CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
-# CONFIG_SCSI_WAIT_SCAN is not set
 # CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_ATA=y
+CONFIG_SATA_AHCI_PLATFORM=y
+# CONFIG_ATA_SFF is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
 CONFIG_FEC_NAPI=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_BRCMFMAC=m
+CONFIG_BRCMDBG=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=720
@@ -109,7 +105,6 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_SERIO_SERPORT is not set
 # CONFIG_CONSOLE_TRANSLATIONS is not set
 # CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVMEM is not set
 # CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
@@ -130,8 +125,11 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 # CONFIG_RC_CORE is not set
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-# CONFIG_VIDEO_MXC_CAMERA is not set
-CONFIG_USB_VIDEO_CLASS=y
+CONFIG_VIDEO_ADV_DEBUG=y
+CONFIG_VIDEO_MXC_CAMERA=m
+CONFIG_MXC_CAMERA_OV5640_MIPI=m
+CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
+CONFIG_USB_VIDEO_CLASS=m
 # CONFIG_USB_GSPCA is not set
 # CONFIG_RADIO_ADAPTERS is not set
 CONFIG_DRM=y
@@ -159,7 +157,6 @@ CONFIG_SND=y
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
 CONFIG_SND_IMX_SOC=y
-CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_SOC_IMX_SPDIF=y
 CONFIG_SND_SOC_IMX_HDMI=y
 CONFIG_HIDRAW=y
@@ -176,7 +173,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=100
-CONFIG_USB_MASS_STORAGE=y
+CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_GPIO_VBUS=y
 CONFIG_USB_ULPI=y
 CONFIG_MMC=y
@@ -185,9 +182,7 @@ CONFIG_MMC_CLKGATE=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_SWITCH=y
 CONFIG_RTC_CLASS=y
-# CONFIG_RTC_INTF_ALARM is not set
 CONFIG_RTC_DRV_SNVS=y
 CONFIG_DMADEVICES=y
 CONFIG_IMX_SDMA=y
@@ -199,6 +194,7 @@ CONFIG_MXC_SSI=y
 # CONFIG_MXC_HWEVENT is not set
 CONFIG_MXC_ASRC=y
 CONFIG_MXC_GPU_VIV=y
+CONFIG_MXC_MIPI_CSI2=y
 CONFIG_EXT4_FS=y
 # CONFIG_DNOTIFY is not set
 CONFIG_VFAT_FS=y
@@ -221,10 +217,12 @@ CONFIG_FRAME_WARN=4096
 CONFIG_STRIP_ASM_SYMS=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_SCHED_DEBUG is not set
-# CONFIG_STACKTRACE is not set
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_FTRACE is not set
 # CONFIG_ARM_UNWIND is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set
diff --git a/recipes-kernel/linux/linux-wandboard.inc b/recipes-kernel/linux/linux-wandboard.inc
index 1cbe93e..cb3f753 100644
--- a/recipes-kernel/linux/linux-wandboard.inc
+++ b/recipes-kernel/linux/linux-wandboard.inc
@@ -14,7 +14,7 @@ LOCALVERSION ?= "+yocto"
 SCMVERSION ?= "y"
 
 # SRC_URI for wandboard kernel
-SRC_URI = "git://repo.or.cz/wandboard.git \
+SRC_URI = "git://github.com/johnweber/linux.git;branch=wandboard-integration \
            file://defconfig \
 "
 
diff --git a/recipes-kernel/linux/linux-wandboard_3.0.35.bb b/recipes-kernel/linux/linux-wandboard_3.0.35.bb
index 79fea5e..df08dc9 100644
--- a/recipes-kernel/linux/linux-wandboard_3.0.35.bb
+++ b/recipes-kernel/linux/linux-wandboard_3.0.35.bb
@@ -4,9 +4,7 @@
 include linux-wandboard.inc
 
 # Wandboard branch
-SRCREV = "86429847b5152f040f190015faedcac49b243328"
+SRCREV = "AUTOINC"
 LOCALVERSION = "-wandboard+yocto"
 
-SRC_URI += "file://0001-ENGR00251005-gpu-4.6.9p11-kernel-code-integration.patch"
-
 COMPATIBLE_MACHINE = "(wandboard)"