diff --git a/.gitmodules b/.gitmodules
index c1f23b8..8ce9683 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,9 +6,6 @@
 [submodule "sysa/mescc-tools-seed/src/mescc-tools-seed"]
 	path = sysa/stage0-posix/src
 	url = https://github.com/oriansj/mescc-tools-seed/
-[submodule "sysa/tcc-0.9.26/src/tcc-0.9.26"]
-	path = sysa/tcc-0.9.26/src/tcc-0.9.26
-	url = https://gitlab.com/janneke/tinycc
 [submodule "sysa/tcc-0.9.26/src/mes-libc"]
 	path = sysa/tcc-0.9.26/src/mes-libc
 	url = https://gitlab.com/janneke/mes
diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
index 374d556..988a7f1 100644
--- a/SHA256SUMS.sources
+++ b/SHA256SUMS.sources
@@ -77,6 +77,7 @@ a5e66f6ebf701b0567f569f57cae82abf5ce57af70a2b45ae71323b61f49134e  perl-5.6.2.tar
 c365874794187f8444e5d22998cd5888ffa47f36def4b77517a808dec27c0600  sed-4.0.9.tar.gz
 c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a  tar-1.12.tar.gz
 63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28  tar-1.34.tar.xz
+23cacd448cff2baf6ed76c2d1e2d654ff4e557046e311dfb6be7e1c631014ef8  tcc-0.9.26.tar.gz
 de23af78fca90ce32dff2dd45b3432b2334740bb9bb7b05bf60fdbfc396ceb9c  tcc-0.9.27.tar.bz2
 988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa  texinfo-6.7.tar.xz
 166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490  xz-5.0.5.tar.bz2
diff --git a/sysa.py b/sysa.py
index 5adefb4..6bb3cf2 100755
--- a/sysa.py
+++ b/sysa.py
@@ -194,7 +194,6 @@ class SysA:
 
         self.create_configuration_file()
         self.deploy_extra_files()
-        self.tcc_0_9_26()
         self.get_packages()
 
     def create_configuration_file(self):
@@ -215,10 +214,6 @@ class SysA:
 
         shutil.copy2(os.path.join(self.git_dir, 'SHA256SUMS.sources'), self.after_dir)
 
-    def tcc_0_9_26(self):
-        """TinyCC 0.9.26 (patched by janneke)"""
-        copytree(os.path.join(self.sysa_dir, 'tcc-0.9.26'), self.after_dir)
-
     # pylint: disable=line-too-long,too-many-statements
     def get_packages(self):
         """Prepare remaining sources"""
@@ -228,6 +223,9 @@ class SysA:
                        "https://download.savannah.gnu.org/releases/nyacc/nyacc-1.00.2.tar.gz"],
                       output=["mes.tar.gz", "nyacc-1.00.2.tar.gz"])
 
+        # tcc 0.9.26 patched by janneke
+        self.get_file("https://lilypond.org/janneke/tcc/tcc-0.9.26-1136-g5bba73cc.tar.gz", output="tcc-0.9.26.tar.gz")
+
         # gzip 1.2.4
         self.get_file("https://mirrors.kernel.org/gnu/gzip/gzip-1.2.4.tar", mkbuild=True)
 
diff --git a/sysa/after.kaem b/sysa/after.kaem
index e16f23a..ae52193 100755
--- a/sysa/after.kaem
+++ b/sysa/after.kaem
@@ -95,15 +95,6 @@ cd ${pkg}
 kaem --file ${pkg}.kaem
 cd ..
 
-# sha-2
-#pkg="sha-2-61555d"
-#cd ${pkg}
-#kaem --file ${pkg}.kaem
-#cd ..
-
-# Check all up to this part as sha256sum
-#sha256sum -c pre-sha.sha256sums
-
 # make
 pkg="make-3.80"
 cd ${pkg}
diff --git a/sysa/bzip2-1.0.8/checksums/bzip2-pass1 b/sysa/bzip2-1.0.8/checksums/bzip2-pass1
index 2261224..e57827e 100644
--- a/sysa/bzip2-1.0.8/checksums/bzip2-pass1
+++ b/sysa/bzip2-1.0.8/checksums/bzip2-pass1
@@ -1,2 +1 @@
-6b7d8a7a65da9beb4c6deb0391be5f1f0da18e77d3f292ae433ffc43b89a3a5f  /after/bin/bzip2
-6b7d8a7a65da9beb4c6deb0391be5f1f0da18e77d3f292ae433ffc43b89a3a5f  /after/bin/bunzip2
+1d7583269b87205d89a0caec0deb8e1d16ed4f4b1926186521ba41d85d66fcb8  /after/bin/bzip2
diff --git a/sysa/tcc-0.9.26/checksums b/sysa/tcc-0.9.26/checksums
index 9de4ce3..29ee671 100644
--- a/sysa/tcc-0.9.26/checksums
+++ b/sysa/tcc-0.9.26/checksums
@@ -1,13 +1,13 @@
-e7b1b2c7d999cd31becd7368f735b1672f24e1e469d73f0641fca5e0b6a314e8  /after/bin/boot0-tcc
-b963670c966c8b545f278c58558ee512d1879556f33be3dd60fdc6c6fe0c42ee  /after/bin/boot1-tcc
-6f2cb537b862b143e031d43a9b554c14bf09dfa7d0232265e5ee5b7792adbdf3  /after/bin/boot2-tcc
-9d3bf2cd0eeac4607032299e5ec999ff3dc8e8dd075e1dbd84292949d15c163c  /after/bin/boot3-tcc
-d4708bc79bee1f4d23789866380a98b5ed0e165ac8ca917b8b928c2d323ddc10  /after/bin/boot4-tcc
+6c4070efbe138c2df73db3e5cde29be920c04ed5d5b163d766d87af94adc38a3  /after/bin/boot0-tcc
+d760c8405fd8d33ca3cd997585badb086da815ecf483c18d45f6aa0bff24ba87  /after/bin/boot1-tcc
+ba3c25cc211b92097095b727fe67d4d90d68c5a1517eb85f9d8c89e121fe03fb  /after/bin/boot2-tcc
+4a56667f4c747e8d3ff802939118760dcaa78efd48220bc54fba61f7fca1ff48  /after/bin/boot3-tcc
+1a51f479033e7e96ce199b3e8031b8318397f6981098a0d9807448f64cdcf877  /after/bin/boot4-tcc
 e94a2468c045582cfd13df51acd0932afdc834fa60139f7bfb7a2d65afa39a65  /after/bin/mes-tcc
-819ebd10859c34f1f34b5ab341fdce4541ccade97ec96b7eac5876875f91e8a7  /after/bin/tcc
+a0baae7938ba53dbea8e35e5062f096b20d38cbe47feb119fa4a5e6b0b9986ab  /after/bin/tcc
 34f62227f8cc61d365d92a182f8f3cc91cc6c50a1bbb8f4774a4383bceaefa5f  /after/lib/libc.a
 12c07ae103e7e3b390150a79e5c600d88de14e9bb73a066f6342582729ef5a3f  /after/lib/libgetopt.a
 44b5f15e1f015685fe4c3d66eda5ba52aac77b94f2edd98b764cec05ca350d49  /after/lib/crt1.o
 09d4f9821a2566f7e56381a19259c41bd97f3c5ed83f490705acbfd1139a7736  /after/lib/crti.o
 461ca1494737fab86fe1c1d3addeaf9d0ece413e353abcdea8674db3f700cda3  /after/lib/crtn.o
-4f7e4089ab34cedf828586d233c29c445c61f4248fc790a057c1b7e12a07ef01  /after/lib/tcc/libtcc1.a
+ac11f09698f092ed76ae40ebcd56cf3f2b903ea1333ef7537a00673dd6f73da7  /after/lib/tcc/libtcc1.a
diff --git a/sysa/tcc-0.9.26/src/tcc-0.9.26 b/sysa/tcc-0.9.26/src/tcc-0.9.26
deleted file mode 160000
index 5bba73c..0000000
--- a/sysa/tcc-0.9.26/src/tcc-0.9.26
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5bba73ccca0e794a6557de166b91923228cb6f73
diff --git a/sysa/tcc-0.9.26/tcc-0.9.26.kaem b/sysa/tcc-0.9.26/tcc-0.9.26.kaem
index 7fd4d9a..c23f9bd 100755
--- a/sysa/tcc-0.9.26/tcc-0.9.26.kaem
+++ b/sysa/tcc-0.9.26/tcc-0.9.26.kaem
@@ -14,7 +14,14 @@ MES_LIB=${MES_PREFIX}/lib
 MES_SOURCE=${MES_PREFIX}
 MES=${bindir}/mes-m2
 
-cd src/tcc-0.9.26
+TCC_TAR=tcc-0.9.26
+TCC_PKG=tcc-0.9.26-1136-g5bba73cc
+
+# Unpack
+cd src
+ungz ${TCC_TAR}.tar.gz
+untar ${TCC_TAR}.tar
+cd ${TCC_PKG}
 
 # Create config.h
 catm config.h
@@ -84,7 +91,7 @@ mes-tcc -ar cr ${libdir}/tcc/libtcc1.a libtcc1.o
 mes-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 lib/posix/getopt.c
 mes-tcc -ar cr ${libdir}/libgetopt.a getopt.o
 
-cd ../tcc-0.9.26
+cd ../${TCC_PKG}
 
 # boot0 (ref comments here for all boot*)
 # compile
@@ -124,13 +131,13 @@ boot0-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crt
 boot0-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crtn.o lib/linux/x86-mes-gcc/crtn.c
 boot0-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crti.o lib/linux/x86-mes-gcc/crti.c
 boot0-tcc -c -D HAVE_CONFIG_H=1 -D HAVE_LONG_LONG_STUB=1 -I include -I include/linux/x86 lib/libtcc1.c
-boot0-tcc -c -D TCC_TARGET_I386=1 ../tcc-0.9.26/lib/libtcc1.c
+boot0-tcc -c -D TCC_TARGET_I386=1 ../${TCC_PKG}/lib/libtcc1.c
 boot0-tcc -ar cr ${libdir}/tcc/libtcc1.a libtcc1.o
 boot0-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-1.o unified-libc-1.c
 boot0-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-2.o unified-libc-2.c
 boot0-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-3.o unified-libc-3.c
 boot0-tcc -ar cr ${libdir}/libc.a unified-libc-1.o unified-libc-2.o unified-libc-3.o
-cd ../tcc-0.9.26
+cd ../${TCC_PKG}
 
 # Test boot0
 boot0-tcc -version
@@ -170,13 +177,13 @@ boot1-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crt
 boot1-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crtn.o lib/linux/x86-mes-gcc/crtn.c
 boot1-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crti.o lib/linux/x86-mes-gcc/crti.c
 boot1-tcc -c -D HAVE_CONFIG_H=1 -D HAVE_LONG_LONG=1 -I include -I include/linux/x86 lib/libtcc1.c
-boot1-tcc -c -D TCC_TARGET_I386=1 ../tcc-0.9.26/lib/libtcc1.c
+boot1-tcc -c -D TCC_TARGET_I386=1 ../${TCC_PKG}/lib/libtcc1.c
 boot1-tcc -ar cr ${libdir}/tcc/libtcc1.a libtcc1.o
 boot1-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-1.o unified-libc-1.c
 boot1-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-2.o unified-libc-2.c
 boot1-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-3.o unified-libc-3.c
 boot1-tcc -ar cr ${libdir}/libc.a unified-libc-1.o unified-libc-2.o unified-libc-3.o
-cd ../tcc-0.9.26
+cd ../${TCC_PKG}
 
 # Test boot1
 boot1-tcc -version
@@ -217,13 +224,13 @@ boot2-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crt
 boot2-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crtn.o lib/linux/x86-mes-gcc/crtn.c
 boot2-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crti.o lib/linux/x86-mes-gcc/crti.c
 boot2-tcc -c -D HAVE_CONFIG_H=1 -D HAVE_FLOAT_STUB=1 -D HAVE_LONG_LONG=1 -I include -I include/linux/x86 lib/libtcc1.c
-boot2-tcc -c -D TCC_TARGET_I386=1 ../tcc-0.9.26/lib/libtcc1.c
+boot2-tcc -c -D TCC_TARGET_I386=1 ../${TCC_PKG}/lib/libtcc1.c
 boot2-tcc -ar cr ${libdir}/tcc/libtcc1.a libtcc1.o
 boot2-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-1.o unified-libc-1.c
 boot2-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-2.o unified-libc-2.c
 boot2-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-3.o unified-libc-3.c
 boot2-tcc -ar cr ${libdir}/libc.a unified-libc-1.o unified-libc-2.o unified-libc-3.o
-cd ../tcc-0.9.26
+cd ../${TCC_PKG}
 
 # Test boot2
 boot2-tcc -version
@@ -264,13 +271,13 @@ boot3-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crt
 boot3-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crtn.o lib/linux/x86-mes-gcc/crtn.c
 boot3-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crti.o lib/linux/x86-mes-gcc/crti.c
 boot3-tcc -c -D HAVE_CONFIG_H=1 -D HAVE_FLOAT=1 -D HAVE_LONG_LONG=1 -I include -I include/linux/x86 lib/libtcc1.c
-boot3-tcc -c -D TCC_TARGET_I386=1 ../tcc-0.9.26/lib/libtcc1.c
+boot3-tcc -c -D TCC_TARGET_I386=1 ../${TCC_PKG}/lib/libtcc1.c
 boot3-tcc -ar cr ${libdir}/tcc/libtcc1.a libtcc1.o
 boot3-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-1.o unified-libc-1.c
 boot3-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-2.o unified-libc-2.c
 boot3-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-3.o unified-libc-3.c
 boot3-tcc -ar cr ${libdir}/libc.a unified-libc-1.o unified-libc-2.o unified-libc-3.o
-cd ../tcc-0.9.26
+cd ../${TCC_PKG}
 
 # Test boot3
 boot3-tcc -version
@@ -311,13 +318,13 @@ boot4-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crt
 boot4-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crtn.o lib/linux/x86-mes-gcc/crtn.c
 boot4-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crti.o lib/linux/x86-mes-gcc/crti.c
 boot4-tcc -c -D HAVE_CONFIG_H=1 -D HAVE_FLOAT=1 -D HAVE_LONG_LONG=1 -I include -I include/linux/x86 lib/libtcc1.c
-boot4-tcc -c -D TCC_TARGET_I386=1 ../tcc-0.9.26/lib/libtcc1.c
+boot4-tcc -c -D TCC_TARGET_I386=1 ../${TCC_PKG}/lib/libtcc1.c
 boot4-tcc -ar cr ${libdir}/tcc/libtcc1.a libtcc1.o
 boot4-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-1.o unified-libc-1.c
 boot4-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-2.o unified-libc-2.c
 boot4-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-3.o unified-libc-3.c
 boot4-tcc -ar cr ${libdir}/libc.a unified-libc-1.o unified-libc-2.o unified-libc-3.o
-cd ../tcc-0.9.26
+cd ../${TCC_PKG}
 
 # Test boot4
 boot4-tcc -version
@@ -358,7 +365,7 @@ boot5-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crt
 boot5-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crtn.o lib/linux/x86-mes-gcc/crtn.c
 boot5-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o ${libdir}/crti.o lib/linux/x86-mes-gcc/crti.c
 boot5-tcc -c -D HAVE_CONFIG_H=1 -D HAVE_FLOAT=1 -D HAVE_LONG_LONG=1 -I include -I include/linux/x86 lib/libtcc1.c
-boot5-tcc -c -D TCC_TARGET_I386=1 ../tcc-0.9.26/lib/libtcc1.c
+boot5-tcc -c -D TCC_TARGET_I386=1 ../${TCC_PKG}/lib/libtcc1.c
 boot5-tcc -ar cr ${libdir}/tcc/libtcc1.a libtcc1.o
 boot5-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-1.o unified-libc-1.c
 boot5-tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/x86 -o unified-libc-2.o unified-libc-2.c