diff --git a/pymediaserv b/pymediaserv
index ba201d0..2889c32 100755
--- a/pymediaserv
+++ b/pymediaserv
@@ -14,8 +14,8 @@ from twisted.internet import reactor
 
 def generateuuid():
 	if False:
-		return 'asdflkjewoifjslkdfj'
-	return ''.join(map(lambda x: random.choice(string.letters), xrange(20)))
+		return 'uuid:asdflkjewoifjslkdfj'
+	return ''.join([ 'uuid:'] + map(lambda x: random.choice(string.letters), xrange(20)))
 
 listenAddr = sys.argv[1]
 if len(sys.argv) > 2:
@@ -23,7 +23,7 @@ if len(sys.argv) > 2:
 	if listenPort < 1024 or listenPort > 65535:
 		raise ValueError, 'port out of range'
 else:
-	listenPort = 8080
+	listenPort = random.randint(10000, 65000)
 
 log.startLogging(sys.stdout)
 
@@ -37,7 +37,7 @@ port = reactor.listenMulticast(SSDP_PORT, s)
 port.joinGroup(SSDP_ADDR)
 port.setLoopbackMode(0)		# don't get our own sends
 
-uuid = 'uuid:' + generateuuid()
+uuid = generateuuid()
 urlbase = 'http://%s:%d/' % (listenAddr, listenPort)
 
 # Create SOAP server
diff --git a/root-device.xml b/root-device.xml
index 5e6bc32..887ac6e 100644
--- a/root-device.xml
+++ b/root-device.xml
@@ -15,19 +15,19 @@
 <modelNumber>1</modelNumber>
 <modelURL>about:blank</modelURL>
 <serialNumber>0</serialNumber>
-<UDN>uuid:%(uuid)s</UDN>
+<UDN>%(uuid)s</UDN>
 <UPC/>
 <serviceList>
 <service>
 <serviceType>urn:schemas-upnp-org:service:ConnectionManager:1</serviceType>
-<serviceId>urn:upnp-org:serviceId:ConnectionManager</serviceId>
+<serviceId>urn:upnp-org:serviceId:urn:schemas-upnp-org:service:ConnectionManager</serviceId>
 <SCPDURL>ConnectionManager/scpd.xml</SCPDURL>
 <controlURL>ConnectionManager/control</controlURL>
 <eventSubURL>ConnectionManager/event</eventSubURL>
 </service>
 <service>
 <serviceType>urn:schemas-upnp-org:service:ContentDirectory:1</serviceType>
-<serviceId>urn:upnp-org:serviceId:ContenDirectory</serviceId>
+<serviceId>urn:upnp-org:serviceId:urn:schemas-upnp-org:service:ContenDirectory</serviceId>
 <SCPDURL>ContentDirectory/scpd.xml</SCPDURL>
 <controlURL>ContentDirectory/control</controlURL>
 <eventSubURL>ContentDirectory/event</eventSubURL>