diff --git a/MediaBrowser.Server.Implementations/Udp/UdpMessageReceivedEventArgs.cs b/MediaBrowser.Server.Implementations/Udp/UdpMessageReceivedEventArgs.cs
new file mode 100644
index 0000000000..5c83a13007
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Udp/UdpMessageReceivedEventArgs.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace MediaBrowser.Server.Implementations.Udp
+{
+    /// <summary>
+    /// Class UdpMessageReceivedEventArgs
+    /// </summary>
+    public class UdpMessageReceivedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the bytes.
+        /// </summary>
+        /// <value>The bytes.</value>
+        public byte[] Bytes { get; set; }
+        /// <summary>
+        /// Gets or sets the remote end point.
+        /// </summary>
+        /// <value>The remote end point.</value>
+        public string RemoteEndPoint { get; set; }
+    }
+}
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index b259388335..7c43b9293e 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -258,7 +258,7 @@ namespace MediaBrowser.ServerApplication
         {
             base.FindParts();
 
-            //if (IsFirstRun)
+            if (IsFirstRun)
             {
                 RegisterServerWithAdministratorAccess();
             }
diff --git a/MediaBrowser.ServerApplication/RegisterServer.bat b/MediaBrowser.ServerApplication/RegisterServer.bat
new file mode 100644
index 0000000000..d762dfaf76
--- /dev/null
+++ b/MediaBrowser.ServerApplication/RegisterServer.bat
@@ -0,0 +1,28 @@
+rem %1 = http server port
+rem %2 = http server url
+rem %3 = udp server port
+rem %4 = tcp server port (web socket)
+
+if [%1]==[] GOTO DONE
+
+netsh advfirewall firewall delete rule name="Port %1" protocol=TCP localport=%1
+netsh advfirewall firewall add rule name="Port %1" dir=in action=allow protocol=TCP localport=%1
+
+if [%2]==[] GOTO DONE
+
+netsh http del urlacl url="%2" user="NT AUTHORITY\Authenticated Users"
+netsh http add urlacl url="%2" user="NT AUTHORITY\Authenticated Users"
+
+if [%3]==[] GOTO DONE
+
+netsh advfirewall firewall delete rule name="Port %3" protocol=UDP localport=%3
+netsh advfirewall firewall add rule name="Port %3" dir=in action=allow protocol=UDP localport=%3
+
+if [%4]==[] GOTO DONE
+
+netsh advfirewall firewall delete rule name="Port %4" protocol=TCP localport=%4
+netsh advfirewall firewall add rule name="Port %4" dir=in action=allow protocol=TCP localport=%4
+
+
+:DONE
+Exit
\ No newline at end of file