@@ -44,10 +44,16 @@
       language: objective-c
     - os: osx
       osx_image: xcode6.4
       language: objective-c
 
+    # AmigaOS
+    - os: linux
+      dist: trusty
+      env:
+        - config=amigaos
+
     # Nintendo DS and 3DS
     - os: linux
       dist: trusty
       env:
         - config=devkitarm
@@ -109,10 +115,15 @@
             wget -q https://download.sourceforge.net/project/devkitpro/devkitPSP/devkitPSP_r16-1-x86_64-linux.tar.bz2;
 
             mkdir -p "$HOME/devkitPro";
             tar -C "$HOME/devkitPro" -xjf devkitPSP_r16-1-x86_64-linux.tar.bz2;
     fi
+
+  - if [ "$config" = "amigaos" ]; then
+            wget -q http://franke.ms/download/amiga-toolchain-centos.tgz;
+            tar -C / -xzf amiga-toolchain-centos.tgz;
+    fi
 
 script:
   - echo -e '%s/-DSTDOUT$/&_SIMPLE/\nwq' | ed -s tests/Makefile
 
   - build() {
@@ -204,10 +215,16 @@
             clang="clang --sysroot $sysroot";
             export OBJC="$clang -arch i386 -arch x86_64";
             export OBJCPP="$clang -arch i386 -E";
             build WRAPPER=true --host=i386-apple-darwin --enable-static;
     fi
+
+  - if [ "$config" = "amigaos" ]; then
+            export PATH="/opt/amiga/bin:$PATH";
+
+            build --host=m68k-amigaos OBJC=m68k-amigaos-g++;
+    fi
 
   - if [ "$config" = "devkitarm" ]; then
             export DEVKITPRO="$HOME/devkitPro";
             export PATH="$DEVKITPRO/devkitARM/bin:$PATH";