diff --git a/doc/configuration.md b/doc/configuration.md
index 0454fb53..b3527fa8 100644
--- a/doc/configuration.md
+++ b/doc/configuration.md
@@ -101,7 +101,7 @@ Note that you need to have the shairport-sync binary on your machine and the sam
 Parameters used to configure the shairport-sync binary:
 
 - `devicename`: Advertised name
-- `port`: RTSP listening port
+- `port`: RTSP listening port (5000 for Airplay 1, 7000 for Airplay 2)
 - `password`: Password
 - `params`: Optional string appended to the shairport-sync invocation. This allows for arbitrary flags to be passed to shairport-sync, for instance `params=--on-start=start.sh%20--on-stop=stop.sh`. The value has to be properly URL-encoded.
 
diff --git a/doc/player_setup.md b/doc/player_setup.md
index b159f3a0..a7f6920f 100644
--- a/doc/player_setup.md
+++ b/doc/player_setup.md
@@ -215,7 +215,8 @@ Although this _might_ be a quick and convenient way to set up an Airplay source
     * `autoreconf -i -f` 
     * `./configure --with-stdout --with-avahi --with-ssl=openssl --with-metadata`
  3. Copy the `shairport-sync` binary somewhere to your `PATH`, e.g. `/usr/local/bin/`
- 4. Configure snapserver with `source = airplay:///shairport-sync?name=Airplay[&devicename=Snapcast][&port=5000]`
+ 4. Configure snapserver with `source = airplay:///shairport-sync?name=Airplay[&devicename=Snapcast][&port=PORT]`
+    * `PORT` is 5000 for Airplay 1 and 7000 for Airplay 2 
 
 ### Spotify
 
diff --git a/server/streamreader/airplay_stream.cpp b/server/streamreader/airplay_stream.cpp
index 676357a4..dcbebae4 100644
--- a/server/streamreader/airplay_stream.cpp
+++ b/server/streamreader/airplay_stream.cpp
@@ -58,7 +58,7 @@ AirplayStream::AirplayStream(PcmStream::Listener* pcmListener, boost::asio::io_c
     string devicename = uri_.getQuery("devicename", "Snapcast");
     string password = uri_.getQuery("password", "");
 
-    params_wo_port_ = "\"--name=" + devicename + "\" --output=stdout --use-stderr --get-coverart";
+    params_wo_port_ = "\"--name=" + devicename + "\" --output=stdout --get-coverart";
     if (!password.empty())
         params_wo_port_ += " --password \"" + password + "\"";
     if (!params_.empty())