diff --git a/packages/mediacenter/kodi-theme-Confluence/package.mk b/packages/mediacenter/kodi-theme-Confluence/package.mk
index f7829b5185..00cb3a1b0c 100644
--- a/packages/mediacenter/kodi-theme-Confluence/package.mk
+++ b/packages/mediacenter/kodi-theme-Confluence/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-theme-Confluence"
-PKG_VERSION="15.0-beta2-81a115b"
+PKG_VERSION="15.0-beta2-658e700"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 08ed19e2b6..92420ba6e3 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi"
-PKG_VERSION="15.0-beta2-81a115b"
+PKG_VERSION="15.0-beta2-658e700"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index a08977e447..0978b12977 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -3165,7 +3165,8 @@ CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 CONFIG_HID_RMI=y
 # CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TIVO=y
 CONFIG_HID_TOPSEED=y
 # CONFIG_HID_THINGM is not set
diff --git a/projects/Nvidia_Legacy/linux/linux.x86_64.conf b/projects/Nvidia_Legacy/linux/linux.x86_64.conf
index 25ffe85fe0..52e461ca8f 100644
--- a/projects/Nvidia_Legacy/linux/linux.x86_64.conf
+++ b/projects/Nvidia_Legacy/linux/linux.x86_64.conf
@@ -3118,7 +3118,8 @@ CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 CONFIG_HID_RMI=y
 # CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TIVO=y
 CONFIG_HID_TOPSEED=y
 # CONFIG_HID_THINGM is not set
diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf
index 529e8ef6a4..de549daf9a 100644
--- a/projects/RPi/linux/linux.arm.conf
+++ b/projects/RPi/linux/linux.arm.conf
@@ -2542,7 +2542,8 @@ CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 CONFIG_HID_RMI=y
 # CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TIVO=y
 CONFIG_HID_TOPSEED=y
 # CONFIG_HID_THINGM is not set
diff --git a/projects/RPi2/linux/linux.arm.conf b/projects/RPi2/linux/linux.arm.conf
index 9295fc4bff..7825e17135 100644
--- a/projects/RPi2/linux/linux.arm.conf
+++ b/projects/RPi2/linux/linux.arm.conf
@@ -2594,7 +2594,8 @@ CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 CONFIG_HID_RMI=y
 # CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TIVO=y
 CONFIG_HID_TOPSEED=y
 # CONFIG_HID_THINGM is not set
diff --git a/projects/WeTek_Play/linux/linux.arm.conf b/projects/WeTek_Play/linux/linux.arm.conf
index 33935497da..ef3cf00927 100644
--- a/projects/WeTek_Play/linux/linux.arm.conf
+++ b/projects/WeTek_Play/linux/linux.arm.conf
@@ -2818,7 +2818,8 @@ CONFIG_HID_SONY=y
 # CONFIG_HID_STEELSERIES is not set
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TIVO=y
 CONFIG_HID_TOPSEED=y
 # CONFIG_HID_THINGM is not set
diff --git a/projects/imx6/linux/linux.arm.conf b/projects/imx6/linux/linux.arm.conf
index 3600d1d1b1..c68a023ff1 100644
--- a/projects/imx6/linux/linux.arm.conf
+++ b/projects/imx6/linux/linux.arm.conf
@@ -3093,7 +3093,8 @@ CONFIG_SONY_FF=y
 CONFIG_HID_SPINELPLUS=y
 CONFIG_HID_SUNPLUS=y
 # CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TIVO=y
 CONFIG_HID_TOPSEED=y
 # CONFIG_HID_THINGM is not set