diff --git a/build.sh b/build.sh
index e45e2a8d..c9a2bc69 100755
--- a/build.sh
+++ b/build.sh
@@ -209,6 +209,13 @@ if [ "$OMR_TARGET" = "bpi-r1" ]; then
 	sed -i "s/CONFIG_MC_SUBSHELL=y/# CONFIG_MC_SUBSHELL is not set/" "$OMR_TARGET/source/.config"
 	sed -i "s/CONFIG_MC_CHARSET=y/# CONFIG_MC_CHARSET is not set/" "$OMR_TARGET/source/.config"
 	sed -i "s/CONFIG_MC_VFS=y/# CONFIG_MC_VFS is not set/" "$OMR_TARGET/source/.config"
+	
+	# Switch to wpad-wolfssl
+	sed -i "s/CONFIG_PACKAGE_wpad-basic=y/# CONFIG_PACKAGE_wpad-basic is not set/" "$OMR_TARGET/source/.config"
+	sed -i "s/CONFIG_PACKAGE_wpad-basic-wolfssl=m/CONFIG_PACKAGE_wpad-basic-wolfssl=y/" "$OMR_TARGET/source/.config"
+
+	# Enable sound soc sunxi kernel module
+	sed -i "s/CONFIG_PACKAGE_kmod-sound-soc-sunxi=m/CONFIG_PACKAGE_kmod-sound-soc-sunxi=y/" "$OMR_TARGET/source/.config"
 fi
 
 cd "$OMR_TARGET/source"
diff --git a/config-bpi-r1 b/config-bpi-r1
index faa8b1cb..f81bcaf8 100644
--- a/config-bpi-r1
+++ b/config-bpi-r1
@@ -1,6 +1,4 @@
-CONFIG_TARGET_ARCH_PACKAGES="sunxi"
 CONFIG_TARGET_BOARD="sunxi"
-CONFIG_TARGET_sunxi_BPI-R1=y
 CONFIG_TARGET_sunxi=y
 CONFIG_TARGET_sunxi_cortexa7=y
 CONFIG_TARGET_sunxi_cortexa7_DEVICE_lamobo_lamobo-r1=y
@@ -14,8 +12,6 @@ CONFIG_PACKAGE_attr=y
 CONFIG_PACKAGE_f2fs-tools=y
 CONFIG_PACKAGE_f2fsck=y
 CONFIG_PACKAGE_mkf2fs=y
-# CONFIG_PACKAGE_mc is not set
-CONFIG_PACKAGE_wpad-basic-wolfssl=y
 CONFIG_PACKAGE_rtl8188eu-firmware=y
 CONFIG_PACKAGE_ath9k-htc-firmware=y
 CONFIG_PACKAGE_mt7601u-firmware=y
@@ -25,7 +21,7 @@ CONFIG_PACKAGE_rtl8192su-firmware=y
 CONFIG_PACKAGE_kmod-switch-bcm53xx=y
 CONFIG_PACKAGE_kmod-switch-bcm53xx-mdio=y
 CONFIG_PACKAGE_swconfig=y
-CONFIG_PACAKGE_kmod-swconfig=y
+CONFIG_PACKAGE_kmod-swconfig=y
 CONFIG_PACKAGE_kmod-ata-sunxi=y
 CONFIG_PACKAGE_kmod-rtl8192cu=y
 CONFIG_PACKAGE_kmod-ath9k-common=y
@@ -44,7 +40,6 @@ CONFIG_PACKAGE_kmod-rtlwifi=y
 CONFIG_PACKAGE_kmod-scsi-core=y
 CONFIG_PACKAGE_kmod-slhc=y
 CONFIG_PACKAGE_kmod-usb-core=y
-CONFIG_PACKAGE_kmod-wdt-sunxi=y
 CONFIG_PACKAGE_kmod-leds-gpio=y
 CONFIG_PACKAGE_kmod-ledtrig-activity=m
 CONFIG_PACKAGE_kmod-ledtrig-gpio=y
@@ -52,6 +47,4 @@ CONFIG_PACKAGE_kmod-ledtrig-oneshot=m
 CONFIG_PACKAGE_kmod-ledtrig-transient=m
 CONFIG_PACKAGE_kmod-ipt-led=m
 CONFIG_PACKAGE_kmod-usb-ledtrig-usbport=m
-CONFIG_PACKAGE_kmod-can-bcm=y
 CONFIG_KERNEL_ARM_MODULE_PLTS=y
-CONFIG_DEFAULT_kmod-sunxi-gmac=y