diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 452b452039..b655733528 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -69,9 +69,11 @@ config BR2_PACKAGE_XENOMAI_REPOSITORY
 	depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT
 
 config BR2_PACKAGE_XENOMAI_VERSION
-	string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION
+	string "Custom Xenomai version" if \
+		!BR2_PACKAGE_XENOMAI_LATEST_VERSION && \
+		!BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL
 	default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION
-	depends on !BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL
+	default "custom" if BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL
 
 config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL
 	string "URL of custom tarball"