diff --git a/releng/TODO b/releng/TODO
index 0670ec93..e8a8a230 100644
--- a/releng/TODO
+++ b/releng/TODO
@@ -21,3 +21,32 @@
   > then we will need configuration means to enable this. By default
   > it should not risk to burn one-time media which sit in the drive
   > by mere accident.
+
+* C++ cleanness - hopefully store C++ samples code in aux/ directory
+  in order to avoid C++ code generation from the shell script test,
+  which would be cumbersome
+
+$ g++ -I ../libisoburn -L ../libisoburn/.libs/ -lisoburn -o cxx cxx.cpp
+
+#include <iostream>
+#include <inttypes.h>
+
+#if __WORDSIZE == 32
+#define _LARGEFILE_SOURCE 1
+#define _FILE_OFFSET_BITS 64
+#endif
+
+#include "libisoburn/xorriso.h"
+
+using namespace std;
+
+int main()
+{
+   cout 
+     << " major:" << Xorriso_header_version_majoR
+     << " minor:" << Xorriso_header_version_minoR
+     << " micro:" << Xorriso_header_version_micrO
+     << endl;
+
+   return 0;
+}