diff --git a/README.html b/README.html
index c8cc5f7..021ad66 100644
--- a/README.html
+++ b/README.html
@@ -461,9 +461,7 @@ compiler)</h2>
 <p>Limitations: “<code>sudo make install</code>” does not work (due to
 lack of “sudo” equivalent on this platform); GStreamer sound was so far
 only confirmed to work with the DirectSound audiosink option
-“<code>-as directsoundsink</code>”. The identification of the “true” MAC
-address of the UxPlay server is not yet implemented on Windows, so a
-random MAC address is used.</p>
+“<code>-as directsoundsink</code>”.</p>
 <ol type="1">
 <li><p>Download and install <strong>Bonjour SDK for Windows
 v3.0</strong> from the official Apple site <a
diff --git a/README.md b/README.md
index 49ac15d..59ba516 100644
--- a/README.md
+++ b/README.md
@@ -383,12 +383,14 @@ as the device is rotated).
 
 ## Building UxPlay on Windows (tested on Windows 10 64bit, using MSYS2 and MinGW-64 compiler)
 
-Limitations: "`sudo make install`" does not work (due to lack of "sudo" equivalent on this platform); GStreamer sound was so far only confirmed to work with the DirectSound audiosink option "`-as directsoundsink`".   The identification of the "true" MAC address of the UxPlay server is not yet implemented on Windows, so a random MAC address is used.
+Limitations: "`sudo make install`" does not work (due to lack of "sudo" equivalent on this platform);
+GStreamer sound was so far only confirmed to work with the DirectSound audiosink option "`-as directsoundsink`".
 
 1. Download and install  **Bonjour SDK for Windows v3.0** from the official Apple site
    [https://developer.apple.com/download](https://developer.apple.com/download/all/?q=Bonjour%20SDK%20for%20Windows)
 
-2. (This is for the MSYS2 build enviroment; other build environments may also work, but are not yet tested): download and install MSYS2 from the official site https://www.msys2.org/
+2. (This is for the MSYS2 build enviroment; other build environments may also work, but are not yet tested):
+   download and install MSYS2 from the official site https://www.msys2.org/
 
 3. For building on Windows 64 bit, install the  **MinGW-64** compiler and cmake ([MSYS2 packages](https://packages.msys2.org/package/) are
    installed with a  variant of the "pacman" package manager adapted from Arch Linux).   After installation,  you can add this
diff --git a/README.txt b/README.txt
index bb9961c..05849e5 100644
--- a/README.txt
+++ b/README.txt
@@ -465,8 +465,6 @@ landscape mode as the device is rotated).
 Limitations: "`sudo make install`" does not work (due to lack of "sudo"
 equivalent on this platform); GStreamer sound was so far only confirmed
 to work with the DirectSound audiosink option "`-as directsoundsink`".
-The identification of the "true" MAC address of the UxPlay server is not
-yet implemented on Windows, so a random MAC address is used.
 
 1.  Download and install **Bonjour SDK for Windows v3.0** from the
     official Apple site
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 7beef1e..feeff89 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -63,6 +63,7 @@ elseif( WIN32 )
                          playfair
                          llhttp
                          wsock32
+			 iphlpapi
                          ws2_32 )
 else()
   target_link_libraries( airplay PUBLIC
diff --git a/uxplay.cpp b/uxplay.cpp
index 417aa82..8fa435c 100644
--- a/uxplay.cpp
+++ b/uxplay.cpp
@@ -28,7 +28,8 @@
 #ifdef _WIN32  /*modifications for Windows compilation */
 #include <glib.h>
 #include <unordered_map>
-#include <windows.h>
+#include <winsock2.h>
+#include <iphlpapi.h>
 #else
 #include <glib-unix.h>
 #include <sys/utsname.h>
@@ -288,10 +289,40 @@ static int parse_hw_addr (std::string str, std::vector<char> &hw_addr) {
 
 static std::string find_mac () {
 /*  finds the MAC address of a network interface *
- *  in a Linux, *BSD or macOS system.            */
+ *  in a Windows, Linux, *BSD or macOS system.   */
     std::string mac = "";
+    char str[3];
 #ifdef _WIN32
-    /* for now, don't find true MAC address if compiled for Windows */ 
+    ULONG buflen = sizeof(IP_ADAPTER_ADDRESSES);
+    PIP_ADAPTER_ADDRESSES addresses = (IP_ADAPTER_ADDRESSES*) malloc(buflen);
+    if (addresses == NULL) { 					
+        return mac;
+    }
+    if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, addresses, &buflen) == ERROR_BUFFER_OVERFLOW) {
+        free(addresses);
+        addresses = (IP_ADAPTER_ADDRESSES*) malloc(buflen);
+        if (addresses == NULL) {
+            return mac;
+        }
+    }
+    if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, addresses, &buflen) == NO_ERROR) {
+        for (PIP_ADAPTER_ADDRESSES address = addresses; address != NULL; address = address->Next) {
+            if (address->PhysicalAddressLength != 6                 /* MAC has 6 octets */
+                || (address->IfType != 6 && address->IfType != 71)  /* Ethernet or Wireless interface */
+                || address->OperStatus != 1) {                      /* interface is up */
+                continue;
+            }
+            mac.erase();
+            for (int i = 0; i < 6; i++) {
+                sprintf(str,"%02x", int(address->PhysicalAddress[i]));
+                mac = mac + str;
+                if (i < 5) mac = mac + ":";
+            }
+	    break;
+        }
+    }
+    free(addresses);
+    return mac;
 #else
     struct ifaddrs *ifap, *ifaptr;
     int non_null_octets = 0;
@@ -315,7 +346,6 @@ static std::string find_mac () {
 #endif
             if (non_null_octets) {
                 mac.erase();
-                char str[3];
                 for (int i = 0; i < 6 ; i++) {
                     sprintf(str,"%02x", octet[i]);
                     mac = mac + str;
@@ -759,6 +789,12 @@ int main (int argc, char *argv[]) {
         use_audio = false;
     }
 
+#ifdef _WIN32    /* don't buffer stdout in WIN32 when debug_log = false */
+    if (!debug_log) {
+      setbuf(stdout, NULL);
+    }
+#endif
+
 #if __APPLE__
     /* force use of -nc option on macOS */
     LOGI("macOS detected: use -nc option as workaround for GStreamer problem");