diff --git a/README.md b/README.md
index f7abc70..3a1fae5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# UxPlay 1.35.1
+# UxPlay 1.36
 
 This project is a GPLv3  unix AirPlay server which  now also works on macOS.
 Its main use is to act like an AppleTV for screen-mirroring (with audio) of iOS/macOS clients
@@ -189,6 +189,7 @@ Options:
 **-n server_name**;  server_name will be the name that appears offering
 AirPlay services to your iPad, iPhone etc.
 **NEW**: this will also now be the name shown above the mirror display (X11)  window, 
+If this option is not used, the hostname of the server will be used as the server name.
 
 **-s wxh** (e.g. -s 1920x1080 , which is the default ) sets the display resolution (width and height,
    in pixels).   (This may be a
@@ -271,6 +272,9 @@ Also: image transforms that had been added to RPiPlay have been ported to UxPlay
 
 
 # ChangeLog
+1.36 2012-09-29    Implemented suggestion (by @mrbesen and @PetrusZ) to use hostname of machine
+                   runing uxplay as the default server name 
+
 1.35.1 2021-09-28  Added the -vs 0 option for streaming audio, but not displaying video.
 
 1.35  2021-09-10   now uses a GLib MainLoop, and builds on macOS (tested on Intel Mac, 10.15 ).
@@ -338,8 +342,7 @@ with the AirPlay client, so this may not be the actual screen geometry that
 displays.
 
 8. The title on the GStreamer display window is now is the AirPlay server name
-(default "UxPlay", but can be changed with option **-n**), rather than the program
-name "uxplay" (note the difference in capitalization).  (This works for X11 windows created
+(This works for X11 windows created
 by gstreamer videosinks ximagesink, xvimagesink, but not OpenGL windows created by glimagesink.)
 
 9. The avahi_compat "nag" warning on startup is suppressed, by placing
@@ -351,6 +354,8 @@ is compiled.) On macOS, Avahi is not used.
 
 10. UxPlay now builds on macOS.
 
+11. Unless the **-n * option is used, the default server name is now the hostname of the server, obtained with uname
+(if the call to unanme produces an error, "UxPlay" is still used as default).
 
 # Disclaimer
 
@@ -407,7 +412,7 @@ Some time [around 2008](https://weblog.rogueamoeba.com/2008/01/10/a-tour-of-airf
 When the Apple TV 2nd generation was introduced in 2010, it received support for the AirTunes protocol. However, because this device allowed playback of visual content, the protocol was extended and renamed AirPlay. It was now possible to stream photo slideshows and videos. Shortly after the release of the Apple TV 2nd generation, AirPlay support for iOS was included in the iOS 4.2 update. It seems like at that point, the audio stream was still actually using the same AirTunes 2 protocol as described above. The video and photo streams were added as a whole new protocol based on HTTP, pretty much independent from the audio stream. Soon, the first curious developers began to [investigate how it worked](https://web.archive.org/web/20101211213705/http://www.tuaw.com/2010/12/08/dear-aunt-tuaw-can-i-airplay-to-my-mac/). Their conclusion was that visual content is streamed unencrypted.
 
 
-In April 2011, a talented hacker [extracted the AirPlay private key](http://www.macrumors.com/2011/04/11/apple-airplay-private-key-exposed-opening-door-to-airport-express-emulators/) from an AirPort Express. This meant that finally, third-party developers were able to also build AirPlay reveiver (server) programs.
+In April 2011, a talented hacker [extracted the AirPlay private key](http://www.macrumors.com/2011/04/11/apple-airplay-private-key-exposed-opening-door-to-airport-express-emulators/) from an AirPort Express. This meant that finally, third-party developers were able to also build AirPlay receiver (server) programs.
 
 
 For iOS 5, released in 2011, Apple added a new protocol to the AirPlay suite: AirPlay mirroring. [Initial investigators](https://www.aorensoftware.com/blog/2011/08/20/exploring-airplay-mirroring-internals/) found this new protocol used encryption in order to protect the transferred video data.
diff --git a/uxplay.cpp b/uxplay.cpp
index f76f147..c2b1512 100755
--- a/uxplay.cpp
+++ b/uxplay.cpp
@@ -24,6 +24,7 @@
 #include <string>
 #include <vector>
 #include <fstream>
+#include <sys/utsname.h>
 #include <glib-unix.h>
 
 #include "log.h"
@@ -34,7 +35,7 @@
 #include "renderers/video_renderer.h"
 #include "renderers/audio_renderer.h"
 
-#define VERSION "1.35.1"
+#define VERSION "1.36"
 
 #define DEFAULT_NAME "UxPlay"
 #define DEFAULT_DEBUG_LOG false
@@ -276,6 +277,13 @@ static bool get_videorotate (const char *str, videoflip_t *videoflip) {
     return true;
 }
 
+static void get_hostname(std::string &hostname) {
+    struct utsname buf;
+    if (!uname(&buf)) {
+        hostname = buf.nodename;
+    }
+}
+
 int main (int argc, char *argv[]) {
     std::string server_name = DEFAULT_NAME;
     std::vector<char> server_hw_addr;
@@ -292,7 +300,10 @@ int main (int argc, char *argv[]) {
     static char avahi_compat_nowarn[] = "AVAHI_COMPAT_NOWARN=1";
     if (!getenv("AVAHI_COMPAT_NOWARN")) putenv(avahi_compat_nowarn);
 #endif
-    
+
+    get_hostname(server_name);
+    printf("%s\n",server_name.c_str());
+
     // Parse arguments
     for (int i = 1; i < argc; i++) {
         std::string arg(argv[i]);