diff --git a/releng/codesamples/sample1.cpp b/releng/codesamples/sample1.cpp
index b804364f..c3d4055f 100644
--- a/releng/codesamples/sample1.cpp
+++ b/releng/codesamples/sample1.cpp
@@ -1,3 +1,5 @@
+// Just to ensure we are C++-clean. This should not spit too much noise
+
 #if __WORDSIZE == 32
 #define _LARGEFILE_SOURCE 1
 #define _FILE_OFFSET_BITS 64
@@ -7,16 +9,13 @@
 #include <inttypes.h>
 #include "xorriso/xorriso.h"
 
-using namespace std;
-
-int main()
-{
-   cout 
+int main() {
+   std::cout 
      << " major:" << Xorriso_header_version_majoR
      << " minor:" << Xorriso_header_version_minoR
      << " micro:" << Xorriso_header_version_micrO
    ;
-//     << endl;
+//     << std::endl;
 
    return 0;
 }
diff --git a/releng/codesamples/sample2.cpp b/releng/codesamples/sample2.cpp
index 6d0b8622..94f1cc74 100644
--- a/releng/codesamples/sample2.cpp
+++ b/releng/codesamples/sample2.cpp
@@ -1,18 +1,36 @@
+// Just to ensure we are C++-clean. This should not spit too much noise
+
 #if __WORDSIZE == 32
 #define _LARGEFILE_SOURCE 1
 #define _FILE_OFFSET_BITS 64
 #endif
 
+#include <iostream>
 #include <inttypes.h>
 #include <libburn/libburn.h>
 #include <libisofs/libisofs.h>
-
 // using namespace burn;
 // (this was needed to before rev.4062 of libisoburn)
+#include <libisoburn/libisoburn.h>
 
-#include "libisoburn/libisoburn.h"
+int main() {
+/*
+   int major=-1, minor=-1, micro=-1;
+   isoburn_version(&major, &minor, &micro);
+   if (major<0 || minor<0 || micro<0)
+     return -1;
+   std::cout 
+          << " major:" << major
+          << " minor:" << minor
+          << " micro:" << micro
+   ;
+*/
+   std::cout 
+          << " major:" << isoburn_libisofs_req_major // major
+          << " minor:" << isoburn_libisofs_req_minor // minor
+          << " micro:" << isoburn_libisofs_req_micro // micro
+   ;
+   //     << std::endl;
 
-int main()
-{
    return 0;
 }
diff --git a/releng/releng_cxx b/releng/releng_cxx
index 7b24674d..4ce60910 100755
--- a/releng/releng_cxx
+++ b/releng/releng_cxx
@@ -92,8 +92,8 @@ fi
       exit 7
    fi
    BASE=$(basename ${SMPL}.obj)
-   printf "${SELF}: Running ${GEN_DATA_DIR}/${BASE}"
-   ${GEN_DATA_DIR}/${BASE}
+   printf "${SELF}: Running LD_LIBRARY_PATH=../libisoburn/.libs/  ${GEN_DATA_DIR}/${BASE}"
+   LD_LIBRARY_PATH=../libisoburn/.libs/ ${GEN_DATA_DIR}/${BASE}
    RET_SMPL="$?"
    case ${RET_SMPL} in
     0)