35 pages, 14 tables, 17 figures; Introduction extended and typos corrected. Version accepted for publication in PRDWe present a study of the B spectrum performed in the framework of Heavy Quark Effective Theory expanded to next-to-leading order in 1/m and non-perturbative in the strong coupling. Our analyses have been performed on Nf=2 lattice gauge field ensembles corresponding to three different lattice spacings and a wide range of pion masses. We obtain the Bs-meson mass and hyperfine splittings of the B- and Bs-mesons that are in good agreement with the experimental values and examine the mass difference m_{Bs}-m_B as a further cross-check of our previous estimate of the b-quark mass. We also report on the mass splitting between the first excited state and the ground state in the B and Bs systems.