diff --git a/config-generic b/config-generic
index f2f6f2767..e27bff8c7 100644
--- a/config-generic
+++ b/config-generic
@@ -2290,6 +2290,9 @@ CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_KXTJ9=m
 # CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
 
+# Baytrail buttons
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+
 #
 # Character devices
 #
@@ -5125,7 +5128,7 @@ CONFIG_ZSMALLOC=y
 # CONFIG_PGTABLE_MAPPING is not set
 
 # CONFIG_MDIO_GPIO is not set
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=m
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
diff --git a/config-x86-generic b/config-x86-generic
index 7968fdaea..d0e1dbd54 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -186,6 +186,68 @@ CONFIG_EDAC_LEGACY_SYSFS=y
 
 CONFIG_SCHED_MC=y
 
+CONFIG_SND_ISA=y
+CONFIG_SND_ES18XX=m
+
+# Baytrail sound
+CONFIG_PWM_LPSS=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_SST_ACPI=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BAYTRAIL=m
+CONFIG_SND_SOC_RT286=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
+
+# no no no
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271 is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_HDMI_CODEC is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_SGTL5000 is not set
+# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
+# CONFIG_SND_SOC_SPDIF is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TLV320AIC3X is not set
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731 is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+# CONFIG_SND_SOC_WM8753 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8804 is not set
+# CONFIG_SND_SOC_WM8903 is not set
+# CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_TPA6130A2 is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+# CONFIG_SND_SOC_FSL_SSI is not set
+# CONFIG_SND_SOC_FSL_SPDIF is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_IMX_AUDMUX is not set
+# CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_STA350 is not set
+
+
 CONFIG_TCG_INFINEON=m
 
 CONFIG_HW_RANDOM_INTEL=m
diff --git a/kernel.spec b/kernel.spec
index 8c6f4fc82..24e4b4005 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -24,7 +24,8 @@ Summary: The Linux kernel
 %global zipsed -e 's/\.ko$/\.ko.xz/'
 %endif
 
-# % define buildid .local
+%global dist awb
+%define buildid .1
 
 # baserelease defines which build revision of this kernel version we're
 # building.  We used to call this fedora_build, but the magical name
@@ -642,6 +643,30 @@ Patch25111: Revert-drm-i915-reverse-dp-link-param-selection-pref.patch
 # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
 Patch30000: kernel-arm64.patch
 
+# END OF FEDORA PATCH DEFINITIONS
+
+# AWB PATCH DEFINITIONS (BAYTRAIL)
+
+# Fixes shutdown and reboot, without quirks
+# https://bugzilla.kernel.org/show_bug.cgi?id=70931
+# https://patchwork.kernel.org/patch/3787341/
+Patch31000: x86-new-Intel-Atom-SoC-power-management-controller-driver.patch
+
+# Battery status support patch series from Lan Tianyu
+# https://bugzilla.kernel.org/show_bug.cgi?id=69011
+# https://lkml.org/lkml/2014/5/20/284
+# patches 1-3 already merged upstream
+Patch31001: V3-4-5-I2C-ACPI-Add-i2c-ACPI-operation-region-support.patch
+Patch31002: V3-5-5-I2C-ACPI-Clean-up-I2C-ACPI-code-and-Add-CONFIG_I2C_ACPI-config.patch
+# http://www.spinics.net/lists/linux-i2c/msg15201.html
+Patch31010: 0001-ACPI-temporary-dep-solution-for-battery-support.patch
+
+# Test fix for SDIO device enumeration from Doug Johnson
+# https://bugzilla.kernel.org/show_bug.cgi?id=67921
+Patch31011: baytrail_gpio_quirk_v3.patch
+
+# END OF AWB PATCH DEFINITIONS
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1371,6 +1396,21 @@ ApplyPatch kernel-arm64.patch -R
 %endif
 %endif
 
+# END OF FEDORA PATCH APPLICATIONS
+
+# AWB (BAYTRAIL) PATCH APPLICATIONS
+ApplyPatch V3-4-5-I2C-ACPI-Add-i2c-ACPI-operation-region-support.patch
+# Not applied as it causes all kinds of config file chaos, and I've never seen
+# the hang/crash that allegedly happens without it...
+#ApplyPatch V3-5-5-I2C-ACPI-Clean-up-I2C-ACPI-code-and-Add-CONFIG_I2C_ACPI-config.patch
+ApplyPatch x86-new-Intel-Atom-SoC-power-management-controller-driver.patch
+
+ApplyPatch 0001-ACPI-temporary-dep-solution-for-battery-support.patch
+# Doesn't apply cleanly to 3.16
+#ApplyPatch baytrail_gpio_quirk_v3.patch
+
+# END OF AWB (BAYTRAIL) PATCH APPLICATIONS
+
 # END OF PATCH APPLICATIONS
 
 %endif