Index: src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour/Service.cs
===================================================================
--- src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour/Service.cs	(revision 142515)
+++ src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour/Service.cs	(working copy)
@@ -133,8 +133,17 @@
         }
 
         public ushort UPort {
-            get { return (ushort)IPAddress.NetworkToHostOrder((int)port); }
-            set { port = (ushort)IPAddress.HostToNetworkOrder((int)value); }
+        	get {
+				if (BitConverter.IsLittleEndian)
+					return (ushort) (((port & 0xFF) << 8) | ((port & 0xFF00) >> 8));
+				return port;
+        	}
+        	set {
+				if (BitConverter.IsLittleEndian)
+					port = (ushort) (((port & 0xFF) << 8) | ((port & 0xFF00) >> 8));
+				else
+					port = value;
+        	}
         }
     }
 }