--- a/src/devices/emu/emu-net-device.cc	Thu Oct 30 15:27:15 2008 -0700
+++ b/src/devices/emu/emu-net-device.cc	Thu Oct 30 15:34:02 2008 -0700
@@ -850,7 +850,17 @@
 Address 
 EmuNetDevice::MakeMulticastAddress (Ipv4Address multicastGroup) const
 {
-  return Mac48Address ("01:00:5e:00:00:00");
+  NS_LOG_FUNCTION (multicastGroup);
+
+  Mac48Address addr = Mac48Address::GetMulticast (multicastGroup);
+
+  //
+  // Implicit conversion (operator Address ()) is defined for Mac48Address, so
+  // use it by just returning the EUI-48 address which is automagically converted
+  // to an Address.
+  //
+  NS_LOG_LOGIC ("Multicast address is " << addr);
+  return addr;
 }
 
 bool