diff --git a/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/addon/addon.xml
index 311e4b9e154..14a7da47452 100644
--- a/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/addon/addon.xml
@@ -4,8 +4,24 @@
 	xsi:schemaLocation="https://openhab.org/schemas/addon/v1.0.0 https://openhab.org/schemas/addon-1.0.0.xsd">
 
 	<type>binding</type>
-	<name>Yamaha Musiccast Binding</name>
-	<description>This is the binding for Yamaha Musiccast</description>
+	<name>Yamaha MusicCast Binding</name>
+	<description>This is the binding for Yamaha MusicCast.</description>
 	<connection>local</connection>
 
+	<discovery-methods>
+		<discovery-method>
+			<service-type>upnp</service-type>
+			<match-properties>
+				<match-property>
+					<name>manufacturer</name>
+					<regex>.*Yamaha.*</regex>
+				</match-property>
+				<match-property>
+					<name>deviceType</name>
+					<regex>.*MediaRenderer.*</regex>
+				</match-property>
+			</match-properties>
+		</discovery-method>
+	</discovery-methods>
+
 </addon:addon>
diff --git a/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast.properties b/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast.properties
index 9c6439ee0ba..905cc3c11fe 100644
--- a/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast.properties
+++ b/bundles/org.openhab.binding.yamahamusiccast/src/main/resources/OH-INF/i18n/yamahamusiccast.properties
@@ -1,7 +1,7 @@
 # add-on
 
-addon.yamahamusiccast.name = Yamaha Musiccast Binding
-addon.yamahamusiccast.description = This is the binding for Yamaha Musiccast
+addon.yamahamusiccast.name = Yamaha MusicCast Binding
+addon.yamahamusiccast.description = This is the binding for Yamaha MusicCast.
 
 # thing types
 
diff --git a/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/addon/addon.xml
index 192fe07be48..a8724b936d3 100644
--- a/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/addon/addon.xml
@@ -5,7 +5,7 @@
 
 	<type>binding</type>
 	<name>YamahaReceiver Binding</name>
-	<description>For all network enabled Yamaha receivers.</description>
+	<description>This is the binding for network enabled Yamaha receivers (without MusicCast support).</description>
 	<connection>local</connection>
 
 	<discovery-methods>
@@ -14,7 +14,7 @@
 			<match-properties>
 				<match-property>
 					<name>manufacturer</name>
-					<regex>(?i).*YAMAHA.*</regex>
+					<regex>.*YAMAHA.*</regex>
 				</match-property>
 				<match-property>
 					<name>deviceType</name>
diff --git a/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/i18n/yamahareceiver.properties b/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/i18n/yamahareceiver.properties
index 65e3d86c953..e297ca4c08f 100644
--- a/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/i18n/yamahareceiver.properties
+++ b/bundles/org.openhab.binding.yamahareceiver/src/main/resources/OH-INF/i18n/yamahareceiver.properties
@@ -1,7 +1,7 @@
 # add-on
 
 addon.yamahareceiver.name = YamahaReceiver Binding
-addon.yamahareceiver.description = For all network enabled Yamaha receivers.
+addon.yamahareceiver.description = This is the binding for network enabled Yamaha receivers (without MusicCast support).
 
 # thing types
 
@@ -160,8 +160,8 @@ channel-type.yamahareceiver.surroundProgram.state.option.Sci-Fi = Sci-Fi
 channel-type.yamahareceiver.surroundProgram.state.option.Spectacle = Spectacle
 channel-type.yamahareceiver.surroundProgram.state.option.Standard = Standard
 channel-type.yamahareceiver.surroundProgram.state.option.Pro\ Logic = Pro Logic
-channel-type.yamahareceiver.surroundProgram.state.option.Neo:6 Music = Neo:6 Music
-channel-type.yamahareceiver.surroundProgram.state.option.Neo:6 Cinema = Neo:6 Cinema
+channel-type.yamahareceiver.surroundProgram.state.option.Neo\:6\ Music = Neo:6 Music
+channel-type.yamahareceiver.surroundProgram.state.option.Neo\:6\ Cinema = Neo:6 Cinema
 channel-type.yamahareceiver.surroundProgram.state.option.PLII[x]\ Game = PLII[x] Game
 channel-type.yamahareceiver.surroundProgram.state.option.PLII[x]\ Music = PLII[x] Music
 channel-type.yamahareceiver.surroundProgram.state.option.PLII[x]\ Movie = PLII[x] Movie