We present in this paper a mechanism to provide intelligent QoS to IEEE 802.11e devices. Our mechanism is hybrid because it combines two mechanisms previously proposed in the literature, while at the same time providing considerable improvements on traffic management on the enhanced distributed channel access (EDCA) mode for IEEE 802.11e. We call our mechanism ACI-EDCA and we evaluate it by simulations with the NS-2 simulator. We test the performance of our proposal with four classes of traffic: Voice over IP (VoIP), Video on Demand (VoD), best-effort, and background traffic.