diff --git a/contrib/single_file_transcoder/basisu_transcoder-in.cpp b/contrib/single_file_transcoder/basisu_transcoder-in.cpp
index b073a37..63d64b6 100644
--- a/contrib/single_file_transcoder/basisu_transcoder-in.cpp
+++ b/contrib/single_file_transcoder/basisu_transcoder-in.cpp
@@ -29,9 +29,11 @@
 #define BASISD_SUPPORT_FXT1 0
 
 /*
- * KTX2 support disabled.
+ * KTX2 support enabled.
  */
-#define BASISD_SUPPORT_KTX2 0
+#define BASISD_SUPPORT_KTX2 1
+
+#define BASISU_ASTC_HELPERS_IMPLEMENTATION
 
 #include "basisu_transcoder.cpp"
 
diff --git a/contrib/single_file_transcoder/combine.py b/contrib/single_file_transcoder/combine.py
index 829d433..8eac17e 100755
--- a/contrib/single_file_transcoder/combine.py
+++ b/contrib/single_file_transcoder/combine.py
@@ -160,7 +160,7 @@ def add_file(file: Path, file_name: str = None) -> None:
         if (not file_name):
             file_name = file.name
         error_line(f'Processing: {file_name}')
-        with file.open('r', errors='replace') as opened:
+        with file.open('r', encoding='utf-8-sig', errors='replace') as opened:
             for line in opened:
                 line = line.rstrip('\n')
                 match_include = include_regex.match(line);
diff --git a/contrib/single_file_transcoder/create_transcoder.sh b/contrib/single_file_transcoder/create_transcoder.sh
index 0c7a435..39616d0 100755
--- a/contrib/single_file_transcoder/create_transcoder.sh
+++ b/contrib/single_file_transcoder/create_transcoder.sh
@@ -22,7 +22,7 @@ which cc > /dev/null
 if [ $? -ne 0 ]; then
   echo "(Skipping compile test)"
 else
-  cc -std=c++11 -Wall -Wextra -Wno-unused-value -Os -g0 -fno-exceptions -fno-rtti -fno-strict-aliasing -o $OUT_FILE examples/simple.cpp -lstdc++ -lm
+  cc -std=c++17 -Wall -Wextra -Wno-unused-value -Os -g0 -fno-exceptions -fno-rtti -fno-strict-aliasing -o $OUT_FILE examples/simple.cpp ../../zstd/zstd.c -lstdc++ -lm
   # Did compilation work?
   if [ $? -ne 0 ]; then
     echo "Compiling simple.cpp: FAILED"