diff --git a/dev-python/kivy/kivy-2.3.1.ebuild b/dev-python/kivy/kivy-2.3.1-r1.ebuild
similarity index 93%
rename from dev-python/kivy/kivy-2.3.1.ebuild
rename to dev-python/kivy/kivy-2.3.1-r1.ebuild
index 6e362e1fc7..edbfbb2ee7 100644
--- a/dev-python/kivy/kivy-2.3.1.ebuild
+++ b/dev-python/kivy/kivy-2.3.1-r1.ebuild
@@ -22,10 +22,11 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="wayland X"
 
 RDEPEND="
 	dev-python/pysdl2[${PYTHON_USEDEP}]
-	media-libs/libsdl2
+	media-libs/libsdl2[wayland?,X?]
 	media-libs/sdl2-image
 	media-libs/sdl2-mixer
 	media-libs/sdl2-ttf
@@ -60,8 +61,8 @@ EPYTEST_PLUGINS=( pytest-asyncio )
 distutils_enable_tests pytest
 
 src_compile() {
-	export USE_WAYLAND=1
-	export USE_X11=1
+	use wayland && export USE_WAYLAND=1
+	use X && export USE_X11=1
 	distutils-r1_src_compile
 }