Index: doc/bibliography/cfa.bib
===================================================================
--- doc/bibliography/cfa.bib	(revision ee89ad4324c98026a0307d32744ebff7f615bf34)
+++ doc/bibliography/cfa.bib	(revision a6af031d63b8955afe7e2db09da0ebaf9b4c6e4b)
@@ -860,22 +860,22 @@
 }
 
-@manual{C11,
+@techreport{C11,
+    type = {International Standard},
     keywords	= {ISO/IEC C 11},
     contributer	= {pabuhr@plg},
-    key		= {C11},
+    key		= {{ISO/IEC} 9889-2011},
     title	= {American National Standard Information technology -- Programming Languages -- {C}},
-    organization= {International Standard ISO/IEC 9899-2011[2012]},
-    publisher   = {International Standard Organization},
+    institution = {International Standard Organization},
     address	= {http://www.iso.org},
     year	= 2012,
 }
 
-@manual{C++Concepts,
+@techreport{C++Concepts,
+    type = {International Standard},
     keywords	= {ISO/IEC TS 19217:2015},
     contributer	= {a3moss@uwaterloo.ca},
-    key		= {C++ Concepts},
+    key		= {{ISO/IEC} {TS} 19217},
     title	= {Information technology -- Programming languages -- {C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} Extensions for concepts},
-    organization= {International Standard ISO/IEC TS 19217:2015},
-    publisher	= {International Standard Organization},
+    institution	= {International Standard Organization},
     address	= {http://www.iso.org},
     year	= 2015