diff --git a/src/tools/make/configure.c b/src/tools/make/configure.c
index f82a5d37..8eedc80c 100644
--- a/src/tools/make/configure.c
+++ b/src/tools/make/configure.c
@@ -126,7 +126,7 @@ void determineOS() {
 #define optimize "" // " -O1"
 
 void determineCCompiler() {
-  snprintf(libspec, sizeof(libspec), " -l %s", oname);
+  snprintf(libspec, sizeof(libspec), " -l%s", oname);
   #if defined(__MINGW32__)
     compiler = "mingw";
     if (sizeof (void*) == 4) {
@@ -137,6 +137,9 @@ void determineCCompiler() {
   #elif defined(__clang__)
     compiler = "clang";
     cc       = "clang -fPIC -g" optimize;
+  #elif defined(__TINYC__)
+    compiler = "tcc";
+    cc       = "tcc -g";
   #elif defined(__GNUC__)
     compiler = "gcc";
     if (strncasecmp(os, "cygwin",  6) == 0) {
diff --git a/src/tools/make/oberon.mk b/src/tools/make/oberon.mk
index 20654d40..0ec66ff9 100644
--- a/src/tools/make/oberon.mk
+++ b/src/tools/make/oberon.mk
@@ -65,10 +65,20 @@ assemble:
 	cd $(BUILDDIR) && $(COMPILE) -c OPM.c     extTools.c      OPS.c      OPT.c
 	cd $(BUILDDIR) && $(COMPILE) -c OPC.c     OPV.c           OPB.c      OPP.c
 
+ifeq ($(COMPILER),tcc)
+	cd $(BUILDDIR) && $(COMPILE) Compiler.c -o $(ROOTDIR)/$(OBECOMP) \
+	SYSTEM.o Configuration.o Platform.o Heap.o  Out.o \
+	Strings.o Modules.o Files.o Reals.o Texts.o \
+	VT100.o extTools.o \
+	OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o
+else
 	cd $(BUILDDIR) && $(COMPILE) $(STATICLINK) Compiler.c -o $(ROOTDIR)/$(OBECOMP) \
-	SYSTEM.o   Configuration.o Platform.o Heap.o  Out.o   Strings.o  \
-	Modules.o  Files.o         Reals.o    Texts.o VT100.o extTools.o \
-	OPM.o      OPS.o           OPT.o      OPC.o   OPV.o   OPB.o    OPP.o
+	SYSTEM.o Configuration.o Platform.o Heap.o  Out.o \
+	Strings.o Modules.o Files.o Reals.o Texts.o \
+	VT100.o extTools.o \
+	OPM.o OPS.o OPT.o OPC.o OPV.o OPB.o OPP.o
+
+endif
 
 	cp src/runtime/*.[ch] $(BUILDDIR)
 	cp src/runtime/*.Txt  $(BUILDDIR)