The challenge faced by Somalia's newly established National Disability Agency (NDA), along with other emerging actors in the disability arena, is how to address the perception that disability is primarily a humanitarian issue in a country that not only is in conflict but also faces cyclical humanitarian crises. A further challenge for the NDA is how to ensure that the humanitarian architecture put in place facilitates non-discrimination, as well as the inclusion of and participation by persons with disabilities. While a typical humanitarian architecture can inadvertently reinforce an already stigmatizing charity or welfare approach towards persons with disabilities, Somalia's experience demonstrates that humanitarian actors can do a lot with leadership, a willingness to leave agency branding behind, and an active committed partner such as the NDA. Nevertheless, genuine inclusion in Somalia's overall State-building project needs also to be the remit of development, reconciliation and similar actors, with access to and participation of persons with disabilities guaranteed in their range of processes and frameworks.