Sodium tetrahydroborate (NaBH 4 = SB) and ammonia-borane (NH 3 BH 3 = AB) were dissolved in sodium aluminate and silicate solutions. Bringing them together caused immediate gel formation and recrystallization of SB and AB during drying. The gel forms geopolymer (G) type units, which enclose and protect the SB and AB crystals inside. SB-G composites are stable over a long time without any loss in SB. An optimized SB-G releases about 1820 L hydrogen per kg, i.e. containing an equivalent of about 80 % of pure SB (2270 L/kg) obtained by means of acidic titration. SB and SB-G remain stable up to 400 °C in vacuum and under inert gas conditions (He, Ar, N 2 ). In air, a reaction starts at about 240 °C, leading to a complete transformation to NaBO 2 above about 320 °C. For SB-G, this reaction is retarded by 50 °C. In the case of AB-G, IR-absorption spectra indicate that the geopolymer matrix consists of mainly sialate units (Si-O-Al-O). Heating experiments at temperatures of 120, 150 and 300 °C show the formation of polyaminoboranes (PAB) and polyiminoboranes (PIB). The underlying reactions could be related to hydrogen release in two exothermic peaks observed at around 122 °C and 160 °C. There are strong indications that DADB, the diammoniate of diborane, (NH 3 BH 2 )[BH] 4 , forms prior to hydrogen release in the first step.