diff --git a/configure.ac b/configure.ac
index 94221d2..50ba507 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,12 @@ AC_DEFUN([AC_CHECK_DEFINED],[
   AS_VAR_POPDEF([ac_var])dnl
 ])
 
-AC_CHECK_HEADERS([getopt.h signal.h termios.h sys/time.h sys/audioio.h])
+AC_CHECK_HEADERS([getopt.h signal.h sys/time.h sys/audioio.h])
+case $host_os in
+dnl don't check half-baked termios for amiga targets.
+  amigaos*|aros*|morphos*) ;;
+  *) AC_CHECK_HEADERS([termios.h]) ;;
+esac
 
 case "$host_cpu" in
 powerpc64)
diff --git a/src/commands.c b/src/commands.c
index e21c8d5..d38f1f5 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -10,6 +10,10 @@
 #if defined(_WIN32) || defined(__OS2__)
 #include <conio.h>
 #endif
+#if defined(AMIGA) || defined(__AMIGA__) || defined(__AROS__)
+#include <proto/exec.h>
+#include <proto/dos.h>
+#endif
 #include <xmp.h>
 #include "common.h"
 
@@ -58,7 +62,7 @@ static int stdin_ready_for_reading(void)
 static int read_key(void)
 {
 	char key;
-	int ret;
+	int ret = 0;
 
 #if defined HAVE_TERMIOS_H && !defined WIN32
 #ifdef __CYGWIN__
@@ -70,7 +74,7 @@ static int read_key(void)
 		key = getch();
 		ret = 1;
 	}
-#elif defined __AMIGA__
+#elif defined(AMIGA) || defined(__AMIGA__) || defined(__AROS__)
 	/* Amiga CLI */
 	{
 		BPTR in = Input();