Index: src/OFSystemInfo.m
==================================================================
--- src/OFSystemInfo.m
+++ src/OFSystemInfo.m
@@ -27,17 +27,20 @@
 # include <sys/utsname.h>
 #endif
 #if defined(OF_MACOS) || defined(OF_NETBSD)
 # include <sys/sysctl.h>
 #endif
+
+#ifdef OF_AMIGAOS
+# include <exec/execbase.h>
+# include <proto/exec.h>
+#endif
 
 #if defined(OF_AMIGAOS4)
 # include <exec/exectags.h>
-# include <proto/exec.h>
 #elif defined(OF_MORPHOS)
 # include <exec/system.h>
-# include <proto/exec.h>
 #endif
 
 #import "OFSystemInfo.h"
 #import "OFApplication.h"
 #import "OFArray.h"
@@ -212,16 +215,14 @@
 		objc_autoreleasePoolPop(pool);
 	}
 # endif
 #elif defined(OF_ANDROID)
 	/* TODO */
-#elif defined(OF_MORPHOS)
-	/* TODO */
-#elif defined(OF_AMIGAOS4)
-	/* TODO */
-#elif defined(OF_AMIGAOS_M68K)
-	/* TODO */
+#elif defined(OF_AMIGAOS)
+	operatingSystemVersion = [[OFString alloc]
+	    initWithFormat: @"Kickstart %u.%u",
+			    SysBase->LibNode.lib_Version, SysBase->SoftVer];
 #elif defined(OF_WII) || defined(NINTENDO_3DS) || defined(OF_NINTENDO_DS) || \
     defined(OF_PSP) || defined(OF_MSDOS)
 	/* Intentionally nothing */
 #elif defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME)
 	struct utsname utsname;
@@ -589,10 +590,12 @@
 	buffer[2] = regs.ecx;
 
 	return [OFString stringWithCString: (char *)buffer
 				  encoding: OFStringEncodingASCII
 				    length: 12];
+#elif defined(OF_M68K)
+	return @"Motorola";
 #else
 	return nil;
 #endif
 }
 
@@ -623,10 +626,23 @@
 	if (version != NULL)
 		return [OFString stringWithFormat: @"%s V%s", model, version];
 	else
 		return [OFString stringWithCString: model
 					  encoding: OFStringEncodingASCII];
+#elif defined(OF_AMIGAOS_M68K)
+	if (SysBase->AttnFlags & AFF_68060)
+		return @"68060";
+	if (SysBase->AttnFlags & AFF_68040)
+		return @"68040";
+	if (SysBase->AttnFlags & AFF_68030)
+		return @"68030";
+	if (SysBase->AttnFlags & AFF_68020)
+		return @"68020";
+	if (SysBase->AttnFlags & AFF_68010)
+		return @"68010";
+	else
+		return @"68000";
 #else
 	return nil;
 #endif
 }