Addis Ababa's Bole Intl Airport is a new 5 gate terminal. On arrival immigration does take some time but you are dealt with in a courteous and professional manner. Although there are signs on the queue's - (Ethiopians Visitors Diplomats etc) you can use any queue. The visitor queue was quite long so we walked up to the diplomat queue and we were stamped in with no questions asked. Luggage collection & customs are swift although all bags are x-rayed by customs. The terminal is beautiful with Ethiopian marble all over the ground and a lot of cultural artefacts throughout the airport. Departures/check-in is fairly swift immigration is a quick stamp out. Note that you are security screened immediately upon entering the airport and before entering your gate. The duty free areas have a nice selection of Ethiopian artefacts. I have to agree with comments below about the bathrooms - they leave a lot to be desired.