diff --git a/mods/ITEMS/mcl_armor/register.lua b/mods/ITEMS/mcl_armor/register.lua
index 89ff5ca9f..c7fa91475 100644
--- a/mods/ITEMS/mcl_armor/register.lua
+++ b/mods/ITEMS/mcl_armor/register.lua
@@ -219,7 +219,7 @@ minetest.register_tool("mcl_armor:elytra", {
 	_doc_items_longdesc = mcl_armor.longdesc,
 	_doc_items_usagehelp = mcl_armor.usage,
 	inventory_image = "mcl_armor_inv_elytra.png",
-	groups = {armor = 1, non_combat_armor = 1, armor_torso = 1, non_combat_torso = 1, mcl_armor_uses = 10},
+	groups = {armor = 1, non_combat_armor = 1, armor_torso = 1, non_combat_torso = 1, mcl_armor_uses = 10, enchantability = 1, elytra = 1},
 	sounds = {
 		_mcl_armor_equip = "mcl_armor_equip_leather",
 		_mcl_armor_unequip = "mcl_armor_unequip_leather",
diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua
index 8ace0a9a9..1de839456 100644
--- a/mods/PLAYER/mcl_playerplus/init.lua
+++ b/mods/PLAYER/mcl_playerplus/init.lua
@@ -239,7 +239,7 @@ minetest.register_globalstep(function(dtime)
 			elytra.speed = 1 - (direction.y/2 + 0.5)
 		end
 
-		elytra.active = player:get_inventory():get_stack("armor", 3):get_name() == "mcl_armor:elytra"
+		elytra.active = minetest.get_item_group(player:get_inventory():get_stack("armor", 3):get_name(), "elytra") ~= 0
 			and not parent
 			and (elytra.active or (is_just_jumped and player_velocity.y < -0))
 			and ((not minetest.registered_nodes[fly_node].walkable) or fly_node == "ignore")