diff --git a/src/player.c b/src/player.c
index edd91ead..dcfa3b30 100644
--- a/src/player.c
+++ b/src/player.c
@@ -123,6 +123,15 @@ struct player_source
 };
 
 
+/* Keep in sync with enum raop_devtype */
+static const char *raop_devtype[] =
+  {
+    "AirPort Express 802.11G",
+    "AirPort Express 802.11N",
+    "AppleTV",
+  };
+
+
 struct event_base *evbase_player;
 
 #ifdef USE_EVENTFD
@@ -2985,9 +2994,8 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
   char *password;
   uint64_t id;
   char has_password;
-  char encrypt;
-  char auth_quirk_itunes;
   char last_active;
+  enum raop_devtype devtype;
   int ret;
 
   ret = safe_hextou64(name, &id);
@@ -3072,15 +3080,15 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
 	DPRINTF(E_LOG, L_PLAYER, "No password given in config for AirTunes device %s\n", name);
     }
 
-  encrypt = 1;
-  auth_quirk_itunes = 0;
+  devtype = RAOP_DEV_APEX_80211N;
+
   p = keyval_get(txt, "am");
   if (!p)
     {
       DPRINTF(E_LOG, L_PLAYER, "AirTunes %s: no am field in TXT record!\n", name);
 
       /* Old AirPort Express */
-      auth_quirk_itunes = 1;
+      devtype = RAOP_DEV_APEX_80211G;
 
       goto no_am;
     }
@@ -3093,7 +3101,7 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
     }
 
   if (strncmp(p, "AppleTV", strlen("AppleTV")) == 0)
-    encrypt = 0;
+    devtype = RAOP_DEV_APPLETV;
 
  no_am:
   /* Check if the device was selected last time */
@@ -3124,7 +3132,7 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
   if (rd->name)
     DPRINTF(E_DBG, L_PLAYER, "Updating AirTunes device %s, already in list\n", name);
   else
-    DPRINTF(E_DBG, L_PLAYER, "Adding AirTunes device %s (password: %s)\n", name, (password) ? "yes" : "no");
+    DPRINTF(E_DBG, L_PLAYER, "Adding AirTunes device %s (password: %s, type %s)\n", name, (password) ? "yes" : "no", raop_devtype[devtype]);
 
   rd->advertised = 1;
   rd->selected = last_active;
@@ -3152,8 +3160,7 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
     free(rd->name);
   rd->name = strdup(at_name);
 
-  rd->encrypt = encrypt;
-  rd->auth_quirk_itunes = auth_quirk_itunes;
+  rd->devtype = devtype;
 
   rd->has_password = has_password;
   rd->password = password;
diff --git a/src/raop.c b/src/raop.c
index 93b2cd58..02e726d1 100644
--- a/src/raop.c
+++ b/src/raop.c
@@ -1559,11 +1559,26 @@ raop_session_make(struct raop_device *rd, int family, raop_status_cb cb)
   rs->status_cb = cb;
   rs->server_fd = -1;
 
-  rs->encrypt = rd->encrypt;
-  rs->auth_quirk_itunes = rd->auth_quirk_itunes;
-
   rs->password = rd->password;
 
+  switch (rd->devtype)
+    {
+      case RAOP_DEV_APEX_80211G:
+	rs->encrypt = 1;
+	rs->auth_quirk_itunes = 1;
+	break;
+
+      case RAOP_DEV_APEX_80211N:
+	rs->encrypt = 1;
+	rs->auth_quirk_itunes = 0;
+	break;
+
+      case RAOP_DEV_APPLETV:
+	rs->encrypt = 0;
+	rs->auth_quirk_itunes = 0;
+	break;
+    }
+
   rs->ctrl = evrtsp_connection_new(address, port);
   if (!rs->ctrl)
     {
diff --git a/src/raop.h b/src/raop.h
index 66290134..bb26ecca 100644
--- a/src/raop.h
+++ b/src/raop.h
@@ -16,6 +16,12 @@ union sockaddr_all
   struct sockaddr_storage ss;
 };
 
+enum raop_devtype {
+  RAOP_DEV_APEX_80211G,
+  RAOP_DEV_APEX_80211N,
+  RAOP_DEV_APPLETV,
+};
+
 struct raop_session;
 
 struct raop_device
@@ -28,10 +34,10 @@ struct raop_device
   short v4_port;
   short v6_port;
 
+  enum raop_devtype devtype;
+
   unsigned selected:1;
   unsigned advertised:1;
-  unsigned encrypt:1;
-  unsigned auth_quirk_itunes:1;
 
   unsigned has_password:1;
   const char *password;