diff --git a/setter/src/main.h b/setter/src/main.h
index 2c00e80..24f1f1b 100644
--- a/setter/src/main.h
+++ b/setter/src/main.h
@@ -58,6 +58,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 #define OS_ARCH "vax"
 #elif defined(__x86_64__) || defined(__amd64) || defined(_M_AMD64) || defined(_M_X64)
 #define OS_ARCH "x86_64"
+#elif defined(Z80) || defined(__Z80) || defined(__Z80N)
+#define OS_ARCH "z80"
 #else
 #define OS_ARCH "unknown"
 #endif
@@ -76,8 +78,14 @@ Copyright (C) 2011-2021 Natalia Portillo
 #define OS_NAME "BeOS"
 #elif defined(__bsdi__)
 #define OS_NAME "BSD/OS"
+#elif defined(__C128__)
+#define OS_NAME "Commodore 128"
 #elif defined(__CYGWIN__)
 #define OS_NAME "Windows NT with Cygwin"
+#elif defined(__CPC__)
+#define OS_NAME "Amstrad CPC"
+#elif defined(__CPM__)
+#define OS_NAME "CP/M"
 #elif defined(__DOS__) || defined(MSDOS)
 #define OS_NAME "DOS"
 #elif defined(__DragonFly__)
@@ -104,6 +112,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 #define OS_NAME "MINIX"
 #elif defined(__MORPHOS__)
 #define OS_NAME "MorphOS"
+#elif defined(__MSX__)
+#define OS_NAME "MSX-DOS"
 #elif defined(__NetBSD__)
 #define OS_NAME "NetBSD"
 #elif defined(__NETWARE__) || defined(__netware__)
@@ -116,6 +126,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 #define OS_NAME "OS/2"
 #elif defined(__palmos__)
 #define OS_NAME "PalmOS"
+#elif defined(__PC88__)
+#define OS_NAME "N88 BASIC"
 #elif defined(EPLAN9)
 #define OS_NAME "Plan 9"
 #elif defined(__QNX__) || defined(__QNXNTO__)
@@ -124,6 +136,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 #define OS_NAME "UnixWare"
 #elif defined(_SCO_DS)
 #define OS_NAME "SCO OpenServer"
+#elif defined(__SPECTRUM__)
+#define OS_NAME "ZX Spectrum"
 #elif defined(sun) || defined(__sun) || defined(__sun__)
 #if defined(__SVR4) || defined(__svr4__)
 #define OS_NAME "Solaris"
@@ -134,6 +148,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 #define OS_NAME "Syllable"
 #elif defined(__osf__) || defined(__osf)
 #define OS_NAME "Tru64 UNIX"
+#elif defined(__TRS80__)
+#define OS_NAME "TRS 80"
 #elif defined(ultrix) || defined(__ultrix) || defined(__ultrix__)
 #define OS_NAME "Ultrix"
 #elif defined(VMS) || defined(__VMS)
diff --git a/setter/src/z80/main.c b/setter/src/z80/main.c
new file mode 100644
index 0000000..413badb
--- /dev/null
+++ b/setter/src/z80/main.c
@@ -0,0 +1,37 @@
+/****************************************************************************
+Aaru Data Preservation Suite
+-----------------------------------------------------------------------------
+
+    Author(s)      : Natalia Portillo
+
+--[ License ] ---------------------------------------------------------------
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as
+     published by the Free Software Foundation, either version 3 of the
+     License, or (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+-----------------------------------------------------------------------------
+Copyright (C) 2011-2021 Natalia Portillo
+*****************************************************************************/
+
+#include <stdio.h>
+
+#include "../main.h"
+
+int main(int argc, char** argv)
+{
+    printf("Aaru Filesystem Tester (Setter) %s\n", AARU_FSTESTER_VERSION);
+    printf("%s\n", AARU_COPYRIGHT);
+    printf("Running in %s (%s)\n", OS_NAME, OS_ARCH);
+    printf("\n");
+
+    return 0;
+}