diff -Nru fs-uae-2.8.2/ChangeLog fs-uae-2.8.3/ChangeLog
--- fs-uae-2.8.2/ChangeLog	2016-12-08 19:47:32.000000000 +0000
+++ fs-uae-2.8.3/ChangeLog	2017-01-08 19:36:26.000000000 +0000
@@ -1,3 +1,17 @@
+Version 2.8.3:
+
+* Fix decoding on non-ascii %-escaped file names on directory HDs.
+* Fixed caps lock.
+* Imported updated translations from crowdin.com.
+
+Version 2.8.2u2:
+
+* Added Added xinput_controller_11_6_1_0_windows.
+
+Version 2.8.2u1:
+
+* Fix loading of bundled gamepad configs for macOS.
+
 Version 2.8.1u1:
 
 * Fix mouse input on Windows with raw keyboard input enabled.
diff -Nru fs-uae-2.8.2/config.guess fs-uae-2.8.3/config.guess
--- fs-uae-2.8.2/config.guess	2014-05-09 20:12:25.000000000 +0000
+++ fs-uae-2.8.3/config.guess	2015-08-07 18:03:44.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-06-10'
+timestamp='2014-03-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	;;
 esac
 
@@ -826,7 +826,7 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -969,10 +969,10 @@
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
 	exit ;;
-    or32:Linux:*:*)
+    or32:Linux:*:* | or1k*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
@@ -1260,16 +1260,26 @@
 	if test "$UNAME_PROCESSOR" = unknown ; then
 	    UNAME_PROCESSOR=powerpc
 	fi
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		case $UNAME_PROCESSOR in
-		    i386) UNAME_PROCESSOR=x86_64 ;;
-		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		esac
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
 	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
 	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
@@ -1361,154 +1371,6 @@
 	exit ;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 <<EOF
 $0: unable to guess system type
 
diff -Nru fs-uae-2.8.2/config.sub fs-uae-2.8.3/config.sub
--- fs-uae-2.8.2/config.sub	2014-05-09 20:12:25.000000000 +0000
+++ fs-uae-2.8.3/config.sub	2015-08-07 18:03:44.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-08-10'
+timestamp='2014-09-11'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -265,6 +265,7 @@
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -282,8 +283,10 @@
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -295,11 +298,11 @@
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -324,7 +327,7 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -381,6 +384,7 @@
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -400,8 +404,10 @@
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -413,6 +419,7 @@
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -822,6 +829,10 @@
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1367,14 +1378,14 @@
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1592,9 +1603,6 @@
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;
diff -Nru fs-uae-2.8.2/configure fs-uae-2.8.3/configure
--- fs-uae-2.8.2/configure	2016-12-11 12:27:51.000000000 +0000
+++ fs-uae-2.8.3/configure	2017-01-08 19:45:06.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FS-UAE 2.8.2.
+# Generated by GNU Autoconf 2.69 for FS-UAE 2.8.3.
 #
 # Report bugs to <frode@fs-uae.net>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='FS-UAE'
 PACKAGE_TARNAME='fs-uae'
-PACKAGE_VERSION='2.8.2'
-PACKAGE_STRING='FS-UAE 2.8.2'
+PACKAGE_VERSION='2.8.3'
+PACKAGE_STRING='FS-UAE 2.8.3'
 PACKAGE_BUGREPORT='frode@fs-uae.net'
 PACKAGE_URL='http://fs-uae.net'
 
@@ -1583,7 +1583,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures FS-UAE 2.8.2 to adapt to many kinds of systems.
+\`configure' configures FS-UAE 2.8.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1654,7 +1654,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of FS-UAE 2.8.2:";;
+     short | recursive ) echo "Configuration of FS-UAE 2.8.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1844,7 +1844,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-FS-UAE configure 2.8.2
+FS-UAE configure 2.8.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2721,7 +2721,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by FS-UAE $as_me 2.8.2, which was
+It was created by FS-UAE $as_me 2.8.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3951,7 +3951,7 @@
 
 # Define the identity of the package.
  PACKAGE='fs-uae'
- VERSION='2.8.2'
+ VERSION='2.8.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14725,7 +14725,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by FS-UAE $as_me 2.8.2, which was
+This file was extended by FS-UAE $as_me 2.8.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14792,7 +14792,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-FS-UAE config.status 2.8.2
+FS-UAE config.status 2.8.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru fs-uae-2.8.2/configure.ac fs-uae-2.8.3/configure.ac
--- fs-uae-2.8.2/configure.ac	2016-12-11 12:25:18.000000000 +0000
+++ fs-uae-2.8.3/configure.ac	2017-01-08 19:36:11.000000000 +0000
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.67])
-AC_INIT([FS-UAE], [2.8.2],
+AC_INIT([FS-UAE], [2.8.3],
         [frode@fs-uae.net], [fs-uae], [http://fs-uae.net])
 AC_CONFIG_AUX_DIR([.])
 AC_CANONICAL_HOST
diff -Nru fs-uae-2.8.2/debian/changelog fs-uae-2.8.3/debian/changelog
--- fs-uae-2.8.2/debian/changelog	2016-12-11 12:25:18.000000000 +0000
+++ fs-uae-2.8.3/debian/changelog	2017-01-08 19:36:11.000000000 +0000
@@ -1,5 +1,5 @@
-fs-uae (2.8.2-0yakkety) yakkety; urgency=low
+fs-uae (2.8.3-0yakkety) yakkety; urgency=low
 
   * Dummy changelog entry.
 
- -- Frode Solheim <frode@fs-uae.net>  Sun, 11 Dec 2016 13:25:18 +0100
+ -- Frode Solheim <frode@fs-uae.net>  Sun,  8 Jan 2017 20:36:11 +0100
Binary files /tmp/tmpsrw1RD/vbjr11EDpS/fs-uae-2.8.2/dist/macosx/fs-uae.icns and /tmp/tmpsrw1RD/aKADNnXWtI/fs-uae-2.8.3/dist/macosx/fs-uae.icns differ
diff -Nru fs-uae-2.8.2/dist/macosx/Makefile.in fs-uae-2.8.3/dist/macosx/Makefile.in
--- fs-uae-2.8.2/dist/macosx/Makefile.in	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/dist/macosx/Makefile.in	2016-12-21 22:08:44.000000000 +0000
@@ -1,5 +1,5 @@
 ver = @PACKAGE_VERSION@
-os = macosx
+os = macos
 arch = $(strip $(shell python3 ../arch.py))
 
 os_arch = $(os)_$(arch)
diff -Nru fs-uae-2.8.2/fs-uae.spec fs-uae-2.8.3/fs-uae.spec
--- fs-uae-2.8.2/fs-uae.spec	2016-12-11 12:25:18.000000000 +0000
+++ fs-uae-2.8.3/fs-uae.spec	2017-01-08 19:36:11.000000000 +0000
@@ -1,6 +1,6 @@
 %define name fs-uae
-%define version 2.8.2
-%define unmangled_version 2.8.2
+%define version 2.8.3
+%define unmangled_version 2.8.3
 %define release 1%{?dist}
 
 %undefine _hardened_build
Binary files /tmp/tmpsrw1RD/vbjr11EDpS/fs-uae-2.8.2/icon/fs-uae.ico and /tmp/tmpsrw1RD/aKADNnXWtI/fs-uae-2.8.3/icon/fs-uae.ico differ
diff -Nru fs-uae-2.8.2/po/cs.po fs-uae-2.8.3/po/cs.po
--- fs-uae-2.8.2/po/cs.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/cs.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-09-10 15:10-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-11 12:01-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
diff -Nru fs-uae-2.8.2/po/da.po fs-uae-2.8.3/po/da.po
--- fs-uae-2.8.2/po/da.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/da.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-09-10 15:11-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-11 12:01-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
diff -Nru fs-uae-2.8.2/po/de.po fs-uae-2.8.3/po/de.po
--- fs-uae-2.8.2/po/de.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/de.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-14 05:19-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:05-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
@@ -30,11 +30,11 @@
 msgstr "Dauerfeuer ist aus"
 
 msgid "Auto-Fire is On"
-msgstr "Dauerfeuer ist an"
+msgstr "Dauerfeuer ist eingeschaltet"
 
 #, c-format
 msgid "Auto-fire disabled for port %d"
-msgstr "Dauerfeuer bei Anschluss %d ist aus"
+msgstr "Dauerfeuer für Anschluss %d ausgeschaltet"
 
 #, c-format
 msgid "Auto-fire enabled for port %d"
@@ -74,7 +74,7 @@
 
 #, c-format
 msgid "Expected FS-UAE version %s, got %s"
-msgstr "Version %s erwartet; ist %s"
+msgstr "FS-UAE in Version %s erwartet; ist %s"
 
 #. / TRANSLATORS: In context "Zoom: Full Frame"
 msgid "Full Frame"
@@ -120,7 +120,7 @@
 #. / TRANSLATORS: This is a menu entry and must not be too long
 #, c-format
 msgid "Joystick Port %d Mode"
-msgstr "Joystick-Anschluss Modus %d"
+msgstr "Joystick-Anschluss-Modus %d"
 
 msgid "Keyboard"
 msgstr "Tastatur"
@@ -170,7 +170,7 @@
 msgstr "Die Option chip_memory muss ein Vielfaches von 512 betragen"
 
 msgid "Option fast_memory must be a multiple of 1024"
-msgstr "Die Option fast_memory muss ein Vielfaches von 1024 sein"
+msgstr "Die Option fast_memory muss ein Vielfaches von 1024 betragen"
 
 msgid "Option motherboard_ram must be a multiple of 1024"
 msgstr "Die Option motherboard_ram muss ein Vielfaches von 1024 betragen"
@@ -179,10 +179,10 @@
 msgstr "Die Option Motherboard_ram benötigt eine CPU mit 32-Bit-Adressierung"
 
 msgid "Option slow_memory must be a multiple of 256"
-msgstr "Die Option slow_memory muss ein Vielfaches von 256 sein"
+msgstr "Die Option slow_memory muss ein Vielfaches von 256 betragen"
 
 msgid "Option uaegfx.card needs a CPU with 32-bit addressing"
-msgstr "Option uaegfx_card benötigt eine CPU mit 32bit-Adressierung"
+msgstr "Die Option uaegfx_card benötigt eine CPU mit 32-Bit-Adressierung"
 
 msgid "Option zorro_iii_memory must be a multiple of 1024"
 msgstr "Die Option zorro_iii_memory muss ein Vielfaches von 1024 betragen"
@@ -215,7 +215,7 @@
 msgstr "Fortsetzen"
 
 msgid "Save"
-msgstr "Sichern"
+msgstr "Speichern"
 
 msgid "Save State"
 msgstr "Zustand speichern"
diff -Nru fs-uae-2.8.2/po/eo.po fs-uae-2.8.3/po/eo.po
--- fs-uae-2.8.2/po/eo.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/eo.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-09-10 15:11-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-11 12:01-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Esperanto\n"
 "Language: eo_UY\n"
diff -Nru fs-uae-2.8.2/po/es.po fs-uae-2.8.3/po/es.po
--- fs-uae-2.8.2/po/es.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/es.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-09-10 15:11-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:05-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
diff -Nru fs-uae-2.8.2/po/fi.po fs-uae-2.8.3/po/fi.po
--- fs-uae-2.8.2/po/fi.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/fi.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-14 05:19-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:05-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
diff -Nru fs-uae-2.8.2/po/fr.po fs-uae-2.8.3/po/fr.po
--- fs-uae-2.8.2/po/fr.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/fr.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-14 05:19-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:05-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
diff -Nru fs-uae-2.8.2/po/hu.po fs-uae-2.8.3/po/hu.po
--- fs-uae-2.8.2/po/hu.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/hu.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-09-10 15:11-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:05-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
diff -Nru fs-uae-2.8.2/po/it.po fs-uae-2.8.3/po/it.po
--- fs-uae-2.8.2/po/it.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/it.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-14 05:19-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:05-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
diff -Nru fs-uae-2.8.2/po/messages.pot fs-uae-2.8.3/po/messages.pot
--- fs-uae-2.8.2/po/messages.pot	2016-05-03 20:34:06.000000000 +0000
+++ fs-uae-2.8.3/po/messages.pot	2016-12-11 14:15:52.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-05-03 22:34+0200\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff -Nru fs-uae-2.8.2/po/nb.po fs-uae-2.8.3/po/nb.po
--- fs-uae-2.8.2/po/nb.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/nb.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-14 05:19-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-11 12:01-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
diff -Nru fs-uae-2.8.2/po/nl.po fs-uae-2.8.3/po/nl.po
--- fs-uae-2.8.2/po/nl.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/nl.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-14 05:19-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:05-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
diff -Nru fs-uae-2.8.2/po/pl.po fs-uae-2.8.3/po/pl.po
--- fs-uae-2.8.2/po/pl.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/pl.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-14 05:19-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-11 12:01-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
diff -Nru fs-uae-2.8.2/po/pt_BR.po fs-uae-2.8.3/po/pt_BR.po
--- fs-uae-2.8.2/po/pt_BR.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/pt_BR.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-01 06:24-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-11 12:01-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
diff -Nru fs-uae-2.8.2/po/pt.po fs-uae-2.8.3/po/pt.po
--- fs-uae-2.8.2/po/pt.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/pt.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-01 06:23-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-11 12:01-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Portuguese\n"
 "Language: pt_PT\n"
@@ -24,7 +24,7 @@
 
 #. / TRANSLATORS: In context "Zoom: Auto"
 msgid "Auto"
-msgstr ""
+msgstr "Automático"
 
 msgid "Auto-Fire is Off"
 msgstr "Auto-Fire está Desligado"
@@ -50,7 +50,7 @@
 
 #. / TRANSLATORS: This is a menu entry and must not be too long
 msgid "Custom Joystick Ports"
-msgstr ""
+msgstr "Portas de Joystick personalizado"
 
 msgid "Custom Mode"
 msgstr "Modo customisado"
@@ -74,7 +74,7 @@
 
 #, c-format
 msgid "Expected FS-UAE version %s, got %s"
-msgstr ""
+msgstr "Versão esperada do FS-UAE %s, tem a %s"
 
 #. / TRANSLATORS: In context "Zoom: Full Frame"
 msgid "Full Frame"
@@ -106,7 +106,7 @@
 msgstr "Modo joystick"
 
 msgid "Joystick Port"
-msgstr ""
+msgstr "Porta do Joystick"
 
 #, c-format
 msgid "Joystick Port %d"
@@ -129,10 +129,10 @@
 msgstr "Abrir"
 
 msgid "Load State"
-msgstr ""
+msgstr "Carregar Estado"
 
 msgid "Max 1 CD-ROM drive supported currently"
-msgstr ""
+msgstr "Atualmente é suportado um máximo de 1 drive de CD-ROM"
 
 msgid "More..."
 msgstr "Mais..."
@@ -144,7 +144,7 @@
 msgstr "Modo Rato"
 
 msgid "Mouse Port"
-msgstr ""
+msgstr "Porta do Rato"
 
 #. / TRANSLATORS: This is a menu entry and must not be too long: If you struggle
 #. / to get in short enough, just translate "No Device" instead.
@@ -173,10 +173,10 @@
 msgstr "Opção fast_memory necessita de múltiplos de 1024"
 
 msgid "Option motherboard_ram must be a multiple of 1024"
-msgstr ""
+msgstr "Opção motherboard_ram tem de ser um múltiplo de 1024"
 
 msgid "Option motherboard_ram needs a CPU with 32-bit addressing"
-msgstr ""
+msgstr "Opção motherboard_ram necessita de um CPU com endereçamento de 32-bit"
 
 msgid "Option slow_memory must be a multiple of 256"
 msgstr "Opção slow_memory necessita de múltiplos de 256"
@@ -188,7 +188,7 @@
 msgstr "Opção zorro_iii_memory necessita de múltiplos de 1024"
 
 msgid "Option zorro_iii_memory needs a CPU with 32-bit addressing"
-msgstr ""
+msgstr "Opção zorro_iii_memory necessita de um CPU com endereçamento de 32-bit"
 
 #. / TRANSLATORS: This is a menu entry and must not be too long
 msgid "Parallel Joystick Ports"
@@ -218,7 +218,7 @@
 msgstr "Guardar"
 
 msgid "Save State"
-msgstr ""
+msgstr "Salvar Estado"
 
 #. / TRANSLATORS: Soft reset reboots the computer without a power cycle
 msgid "Soft Reset"
@@ -235,15 +235,15 @@
 
 #, c-format
 msgid "Zoom: %s"
-msgstr ""
+msgstr "Aumentar: %s"
 
 #, c-format
 msgid "Zoom: %s + Border"
 msgstr "Zoom: %s + Margem"
 
 msgid "[ Port 0 ] Switched to joystick mode"
-msgstr ""
+msgstr "[ Port 0 ] Alterado para modo joystick"
 
 msgid "[ Port 0 ] Switched to mouse mode"
-msgstr ""
+msgstr "[ Port 0 ] Alterado para modo rato"
 
diff -Nru fs-uae-2.8.2/po/sr.po fs-uae-2.8.3/po/sr.po
--- fs-uae-2.8.2/po/sr.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/sr.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-01 06:24-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-11 12:01-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Serbian (Latin)\n"
 "Language: sr_CS\n"
diff -Nru fs-uae-2.8.2/po/sv.po fs-uae-2.8.3/po/sv.po
--- fs-uae-2.8.2/po/sv.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/sv.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-01 06:24-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-11 12:01-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
diff -Nru fs-uae-2.8.2/po/tr.po fs-uae-2.8.3/po/tr.po
--- fs-uae-2.8.2/po/tr.po	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/po/tr.po	2017-01-08 19:37:32.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: fs-uae\n"
 "Report-Msgid-Bugs-To: frode@fs-uae.net\n"
-"POT-Creation-Date: 2016-04-26 00:59+0200\n"
-"PO-Revision-Date: 2016-05-14 05:19-0400\n"
+"POT-Creation-Date: 2016-12-11 15:15+0100\n"
+"PO-Revision-Date: 2016-12-31 10:05-0500\n"
 "Last-Translator: FrodeSolheim <frode-crowdin@fsolheim.net>\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
diff -Nru fs-uae-2.8.2/share/fs-uae/input/0b040000000000003365000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/0b040000000000003365000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/0b040000000000003365000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/0b040000000000003365000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = SPEED-LINK Competition Pro
-platform = macosx
+platform = macos
 
 [device]
 make = Speed-Link
diff -Nru fs-uae-2.8.2/share/fs-uae/input/2_in_1_dt_12_4_1_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/2_in_1_dt_12_4_1_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/2_in_1_dt_12_4_1_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/2_in_1_dt_12_4_1_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,42 @@
+[fs-uae-controller]
+name = 2 in 1 DT
+platform = macos
+
+[device]
+make = Thrustmaster
+model = 2 in 1 DT
+type = gamepad
+
+[sdl]
+guid = 4f0400000000000020b3000000000000
+buttons = 12
+hats = 1
+axes = 4
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_neg = rstick_left
+axis_2_pos = rstick_right
+axis_3_neg = rstick_up
+axis_3_pos = rstick_down
+button_0 = south_button
+button_1 = west_button
+button_10 = lstick_button
+button_11 = rstick_button
+button_2 = east_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = left_trigger
+button_6 = right_shoulder
+button_7 = right_trigger
+button_8 = select_button
+button_9 = start_button
+hat_0_down = dpad_down
+hat_0_left = dpad_left
+hat_0_right = dpad_right
+hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/2_in_1_dt_12_4_1_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/2_in_1_dt_12_4_1_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/2_in_1_dt_12_4_1_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/2_in_1_dt_12_4_1_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-[fs-uae-controller]
-name = 2 in 1 DT
-platform = macosx
-
-[device]
-make = Thrustmaster
-model = 2 in 1 DT
-type = gamepad
-
-[sdl]
-guid = 4f0400000000000020b3000000000000
-buttons = 12
-hats = 1
-axes = 4
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_neg = rstick_left
-axis_2_pos = rstick_right
-axis_3_neg = rstick_up
-axis_3_pos = rstick_down
-button_0 = south_button
-button_1 = west_button
-button_10 = lstick_button
-button_11 = rstick_button
-button_2 = east_button
-button_3 = north_button
-button_4 = left_shoulder
-button_5 = left_trigger
-button_6 = right_shoulder
-button_7 = right_trigger
-button_8 = select_button
-button_9 = start_button
-hat_0_down = dpad_down
-hat_0_left = dpad_left
-hat_0_right = dpad_right
-hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/300f0000000000001201000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/300f0000000000001201000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/300f0000000000001201000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/300f0000000000001201000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = Dual Analog Pad
-platform = macosx
+platform = macos
 
 [device]
 make = Saitek
diff -Nru fs-uae-2.8.2/share/fs-uae/input/4c050000000000006802000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/4c050000000000006802000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/4c050000000000006802000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/4c050000000000006802000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = PLAYSTATION(R)3 Controller
-platform = macosx
+platform = macos
 
 [device]
 make = Sony
diff -Nru fs-uae-2.8.2/share/fs-uae/input/4c05000000000000c405000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/4c05000000000000c405000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/4c05000000000000c405000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/4c05000000000000c405000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = Wireless Controller
-platform = macosx
+platform = macos
 
 [device]
 make = Sony
diff -Nru fs-uae-2.8.2/share/fs-uae/input/4f0400000000000015b3000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/4f0400000000000015b3000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/4f0400000000000015b3000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/4f0400000000000015b3000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = Thrustmaster dual analog 3.2
-platform = macosx
+platform = macos
 
 [device]
 make = Thrustmaster
diff -Nru fs-uae-2.8.2/share/fs-uae/input/4f0400000000000020b3000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/4f0400000000000020b3000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/4f0400000000000020b3000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/4f0400000000000020b3000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = 2 in 1 DT
-platform = macosx
+platform = macos
 
 [device]
 make = Thrustmaster
diff -Nru fs-uae-2.8.2/share/fs-uae/input/5e040000000000008e02000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/5e040000000000008e02000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/5e040000000000008e02000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/5e040000000000008e02000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = Xbox 360 Wired Controller
-platform = macosx
+platform = macos
 
 [device]
 make = Microsoft
diff -Nru fs-uae-2.8.2/share/fs-uae/input/6d0400000000000016c2000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/6d0400000000000016c2000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/6d0400000000000016c2000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/6d0400000000000016c2000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = Logitech Dual Action
-platform = macosx
+platform = macos
 
 [device]
 make = Logitech
diff -Nru fs-uae-2.8.2/share/fs-uae/input/6d0400000000000018c2000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/6d0400000000000018c2000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/6d0400000000000018c2000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/6d0400000000000018c2000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = Logitech Rumblepad 2 USB
-platform = macosx
+platform = macos
 
 [device]
 make = Logitech
diff -Nru fs-uae-2.8.2/share/fs-uae/input/6d0400000000000019c2000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/6d0400000000000019c2000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/6d0400000000000019c2000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/6d0400000000000019c2000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = Logitech Cordless RumblePad 2
-platform = macosx
+platform = macos
 
 [device]
 make = Logitech
diff -Nru fs-uae-2.8.2/share/fs-uae/input/6d040000000000001dc2000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/6d040000000000001dc2000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/6d040000000000001dc2000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/6d040000000000001dc2000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = Xbox 360 Wired Controller
-platform = macosx
+platform = macos
 
 [device]
 make = Logitech
diff -Nru fs-uae-2.8.2/share/fs-uae/input/6d040000000000001ec2000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/6d040000000000001ec2000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/6d040000000000001ec2000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/6d040000000000001ec2000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = Xbox 360 Wired Controller
-platform = macosx
+platform = macos
 
 [device]
 make = Logitech
diff -Nru fs-uae-2.8.2/share/fs-uae/input/6d040000000000001fc2000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/6d040000000000001fc2000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/6d040000000000001fc2000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/6d040000000000001fc2000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = Xbox 360 Wired Controller
-platform = macosx
+platform = macos
 
 [device]
 make = Logitech
diff -Nru fs-uae-2.8.2/share/fs-uae/input/6d04000000000000d2ca000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/6d04000000000000d2ca000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/6d04000000000000d2ca000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/6d04000000000000d2ca000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = PS3/USB Cordless Gamepad
-platform = macosx
+platform = macos
 
 [device]
 make = Logitech
diff -Nru fs-uae-2.8.2/share/fs-uae/input/78696e70757401000000000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/78696e70757401000000000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/78696e70757401000000000000000000.fs-uae-controller	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/78696e70757401000000000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,42 @@
+[fs-uae-controller]
+name = XInput Controller
+platform = windows
+
+[device]
+make = XInput
+model = Controller
+type = gamepad
+
+[sdl]
+guid = 78696e70757401000000000000000000
+buttons = 11
+hats = 1
+axes = 6
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_pos = left_trigger
+axis_3_neg = rstick_left
+axis_3_pos = rstick_right
+axis_4_neg = rstick_up
+axis_4_pos = rstick_down
+axis_5_pos = right_trigger
+button_0 = south_button
+button_1 = east_button
+button_2 = west_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = select_button
+button_7 = start_button
+button_8 = lstick_button
+button_9 = rstick_button
+hat_0_down = dpad_down
+hat_0_left = dpad_left
+hat_0_right = dpad_right
+hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/8117000000000000990a000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/8117000000000000990a000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/8117000000000000990a000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/8117000000000000990a000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = Retro Joystick Adapter v2.0
-platform = macosx
+platform = macos
 
 [device]
 make = Retronic
diff -Nru fs-uae-2.8.2/share/fs-uae/input/83050000000000006020000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/83050000000000006020000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/83050000000000006020000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/83050000000000006020000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = USB,2-axis 8-button gamepad
-platform = macosx
+platform = macos
 
 [device]
 make = iBuffalo
diff -Nru fs-uae-2.8.2/share/fs-uae/input/a3060000000000000901000000000000.fs-uae-controller fs-uae-2.8.3/share/fs-uae/input/a3060000000000000901000000000000.fs-uae-controller
--- fs-uae-2.8.2/share/fs-uae/input/a3060000000000000901000000000000.fs-uae-controller	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/a3060000000000000901000000000000.fs-uae-controller	2016-12-27 21:06:04.000000000 +0000
@@ -1,6 +1,6 @@
 [fs-uae-controller]
 name = P880
-platform = macosx
+platform = macos
 
 [device]
 make = Saitek
diff -Nru fs-uae-2.8.2/share/fs-uae/input/dual_analog_pad_12_4_1_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/dual_analog_pad_12_4_1_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/dual_analog_pad_12_4_1_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/dual_analog_pad_12_4_1_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,42 @@
+[fs-uae-controller]
+name = Dual Analog Pad
+platform = macos
+
+[device]
+make = Saitek
+model = P380
+type = gamepad
+
+[sdl]
+guid = 300f0000000000001201000000000000
+buttons = 12
+hats = 1
+axes = 4
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_neg = rstick_up
+axis_2_pos = rstick_down
+axis_3_neg = rstick_left
+axis_3_pos = rstick_right
+button_0 = west_button
+button_1 = north_button
+button_10 = lstick_button
+button_11 = rstick_button
+button_2 = south_button
+button_3 = east_button
+button_4 = left_shoulder
+button_5 = left_trigger
+button_6 = right_shoulder
+button_7 = right_trigger
+button_8 = select_button
+button_9 = start_button
+hat_0_down = dpad_down
+hat_0_left = dpad_left
+hat_0_right = dpad_right
+hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/dual_analog_pad_12_4_1_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/dual_analog_pad_12_4_1_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/dual_analog_pad_12_4_1_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/dual_analog_pad_12_4_1_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-[fs-uae-controller]
-name = Dual Analog Pad
-platform = macosx
-
-[device]
-make = Saitek
-model = P380
-type = gamepad
-
-[sdl]
-guid = 300f0000000000001201000000000000
-buttons = 12
-hats = 1
-axes = 4
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_neg = rstick_up
-axis_2_pos = rstick_down
-axis_3_neg = rstick_left
-axis_3_pos = rstick_right
-button_0 = west_button
-button_1 = north_button
-button_10 = lstick_button
-button_11 = rstick_button
-button_2 = south_button
-button_3 = east_button
-button_4 = left_shoulder
-button_5 = left_trigger
-button_6 = right_shoulder
-button_7 = right_trigger
-button_8 = select_button
-button_9 = start_button
-hat_0_down = dpad_down
-hat_0_left = dpad_left
-hat_0_right = dpad_right
-hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,42 @@
+[fs-uae-controller]
+name = Logitech Cordless RumblePad 2
+platform = macos
+
+[device]
+make = Logitech
+model = F710
+type = gamepad
+
+[sdl]
+guid = 6d0400000000000019c2000000000000
+buttons = 12
+hats = 1
+axes = 4
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_neg = rstick_left
+axis_2_pos = rstick_right
+axis_3_neg = rstick_up
+axis_3_pos = rstick_down
+button_0 = west_button
+button_1 = south_button
+button_10 = lstick_button
+button_11 = rstick_button
+button_2 = east_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = left_trigger
+button_7 = right_trigger
+button_8 = select_button
+button_9 = start_button
+hat_0_down = dpad_down
+hat_0_left = dpad_left
+hat_0_right = dpad_right
+hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/logitech_cordless_rumblepad_2_12_4_1_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-[fs-uae-controller]
-name = Logitech Cordless RumblePad 2
-platform = macosx
-
-[device]
-make = Logitech
-model = F710
-type = gamepad
-
-[sdl]
-guid = 6d0400000000000019c2000000000000
-buttons = 12
-hats = 1
-axes = 4
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_neg = rstick_left
-axis_2_pos = rstick_right
-axis_3_neg = rstick_up
-axis_3_pos = rstick_down
-button_0 = west_button
-button_1 = south_button
-button_10 = lstick_button
-button_11 = rstick_button
-button_2 = east_button
-button_3 = north_button
-button_4 = left_shoulder
-button_5 = right_shoulder
-button_6 = left_trigger
-button_7 = right_trigger
-button_8 = select_button
-button_9 = start_button
-hat_0_down = dpad_down
-hat_0_left = dpad_left
-hat_0_right = dpad_right
-hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/logitech_dual_action_12_4_1_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/logitech_dual_action_12_4_1_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/logitech_dual_action_12_4_1_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/logitech_dual_action_12_4_1_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,42 @@
+[fs-uae-controller]
+name = Logitech Dual Action
+platform = macos
+
+[device]
+make = Logitech
+model = F310
+type = gamepad
+
+[sdl]
+guid = 6d0400000000000016c2000000000000
+buttons = 12
+hats = 1
+axes = 4
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_neg = rstick_left
+axis_2_pos = rstick_right
+axis_3_neg = rstick_up
+axis_3_pos = rstick_down
+button_0 = west_button
+button_1 = south_button
+button_10 = lstick_button
+button_11 = rstick_button
+button_2 = east_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = left_trigger
+button_7 = right_trigger
+button_8 = select_button
+button_9 = start_button
+hat_0_down = dpad_down
+hat_0_left = dpad_left
+hat_0_right = dpad_right
+hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/logitech_dual_action_12_4_1_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/logitech_dual_action_12_4_1_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/logitech_dual_action_12_4_1_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/logitech_dual_action_12_4_1_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-[fs-uae-controller]
-name = Logitech Dual Action
-platform = macosx
-
-[device]
-make = Logitech
-model = F310
-type = gamepad
-
-[sdl]
-guid = 6d0400000000000016c2000000000000
-buttons = 12
-hats = 1
-axes = 4
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_neg = rstick_left
-axis_2_pos = rstick_right
-axis_3_neg = rstick_up
-axis_3_pos = rstick_down
-button_0 = west_button
-button_1 = south_button
-button_10 = lstick_button
-button_11 = rstick_button
-button_2 = east_button
-button_3 = north_button
-button_4 = left_shoulder
-button_5 = right_shoulder
-button_6 = left_trigger
-button_7 = right_trigger
-button_8 = select_button
-button_9 = start_button
-hat_0_down = dpad_down
-hat_0_left = dpad_left
-hat_0_right = dpad_right
-hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,42 @@
+[fs-uae-controller]
+name = Logitech Rumblepad 2 USB
+platform = macos
+
+[device]
+make = Logitech
+model = F510
+type = gamepad
+
+[sdl]
+guid = 6d0400000000000018c2000000000000
+buttons = 12
+hats = 1
+axes = 4
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_neg = rstick_left
+axis_2_pos = rstick_right
+axis_3_neg = rstick_up
+axis_3_pos = rstick_down
+button_0 = west_button
+button_1 = south_button
+button_10 = lstick_button
+button_11 = rstick_button
+button_2 = east_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = left_trigger
+button_7 = right_trigger
+button_8 = select_button
+button_9 = start_button
+hat_0_down = dpad_down
+hat_0_left = dpad_left
+hat_0_right = dpad_right
+hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/logitech_rumblepad_2_usb_12_4_1_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-[fs-uae-controller]
-name = Logitech Rumblepad 2 USB
-platform = macosx
-
-[device]
-make = Logitech
-model = F510
-type = gamepad
-
-[sdl]
-guid = 6d0400000000000018c2000000000000
-buttons = 12
-hats = 1
-axes = 4
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_neg = rstick_left
-axis_2_pos = rstick_right
-axis_3_neg = rstick_up
-axis_3_pos = rstick_down
-button_0 = west_button
-button_1 = south_button
-button_10 = lstick_button
-button_11 = rstick_button
-button_2 = east_button
-button_3 = north_button
-button_4 = left_shoulder
-button_5 = right_shoulder
-button_6 = left_trigger
-button_7 = right_trigger
-button_8 = select_button
-button_9 = start_button
-hat_0_down = dpad_down
-hat_0_left = dpad_left
-hat_0_right = dpad_right
-hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/p880_12_4_1_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/p880_12_4_1_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/p880_12_4_1_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/p880_12_4_1_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,40 @@
+[fs-uae-controller]
+name = P880
+platform = macos
+
+[device]
+make = Saitek
+model = P880
+type = gamepad
+
+[sdl]
+guid = a3060000000000000901000000000000
+buttons = 12
+hats = 1
+axes = 4
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_neg = rstick_up
+axis_2_pos = rstick_down
+axis_3_neg = rstick_left
+axis_3_pos = rstick_right
+button_0 = west_button
+button_1 = north_button
+button_2 = south_button
+button_3 = east_button
+button_4 = select_button
+button_5 = start_button
+button_6 = left_shoulder
+button_7 = right_shoulder
+button_8 = lstick_button
+button_9 = rstick_button
+hat_0_down = dpad_down
+hat_0_left = dpad_left
+hat_0_right = dpad_right
+hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/p880_12_4_1_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/p880_12_4_1_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/p880_12_4_1_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/p880_12_4_1_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-[fs-uae-controller]
-name = P880
-platform = macosx
-
-[device]
-make = Saitek
-model = P880
-type = gamepad
-
-[sdl]
-guid = a3060000000000000901000000000000
-buttons = 12
-hats = 1
-axes = 4
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_neg = rstick_up
-axis_2_pos = rstick_down
-axis_3_neg = rstick_left
-axis_3_pos = rstick_right
-button_0 = west_button
-button_1 = north_button
-button_2 = south_button
-button_3 = east_button
-button_4 = select_button
-button_5 = start_button
-button_6 = left_shoulder
-button_7 = right_shoulder
-button_8 = lstick_button
-button_9 = rstick_button
-hat_0_down = dpad_down
-hat_0_left = dpad_left
-hat_0_right = dpad_right
-hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,43 @@
+[fs-uae-controller]
+name = PLAYSTATION(R)3 Controller
+platform = macos
+
+[device]
+make = Sony
+model = DualShock 3
+type = gamepad
+
+[sdl]
+guid = 4c050000000000006802000000000000
+buttons = 19
+hats = 0
+axes = 4
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_neg = rstick_left
+axis_2_pos = rstick_right
+axis_3_neg = rstick_up
+axis_3_pos = rstick_down
+button_0 = select_button
+button_1 = lstick_button
+button_10 = left_shoulder
+button_11 = right_shoulder
+button_12 = north_button
+button_13 = east_button
+button_14 = south_button
+button_15 = west_button
+button_16 = menu_button
+button_2 = rstick_button
+button_3 = start_button
+button_4 = dpad_up
+button_5 = dpad_right
+button_6 = dpad_down
+button_7 = dpad_left
+button_8 = left_trigger
+button_9 = right_trigger
diff -Nru fs-uae-2.8.2/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/playstation_r_3_controller_19_4_0_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-[fs-uae-controller]
-name = PLAYSTATION(R)3 Controller
-platform = macosx
-
-[device]
-make = Sony
-model = DualShock 3
-type = gamepad
-
-[sdl]
-guid = 4c050000000000006802000000000000
-buttons = 19
-hats = 0
-axes = 4
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_neg = rstick_left
-axis_2_pos = rstick_right
-axis_3_neg = rstick_up
-axis_3_pos = rstick_down
-button_0 = select_button
-button_1 = lstick_button
-button_10 = left_shoulder
-button_11 = right_shoulder
-button_12 = north_button
-button_13 = east_button
-button_14 = south_button
-button_15 = west_button
-button_16 = menu_button
-button_2 = rstick_button
-button_3 = start_button
-button_4 = dpad_up
-button_5 = dpad_right
-button_6 = dpad_down
-button_7 = dpad_left
-button_8 = left_trigger
-button_9 = right_trigger
diff -Nru fs-uae-2.8.2/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,43 @@
+[fs-uae-controller]
+name = PS3/USB Cordless Gamepad
+platform = macos
+
+[device]
+make = Logitech
+model = Cordless Precision
+type = gamepad
+
+[sdl]
+guid = 6d04000000000000d2ca000000000000
+buttons = 13
+hats = 1
+axes = 4
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_neg = rstick_left
+axis_2_pos = rstick_right
+axis_3_neg = rstick_up
+axis_3_pos = rstick_down
+button_0 = west_button
+button_1 = south_button
+button_10 = lstick_button
+button_11 = rstick_button
+button_12 = menu_button
+button_2 = east_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = left_trigger
+button_7 = right_trigger
+button_8 = select_button
+button_9 = start_button
+hat_0_down = dpad_down
+hat_0_left = dpad_left
+hat_0_right = dpad_right
+hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/ps3_usb_cordless_gamepad_13_4_1_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-[fs-uae-controller]
-name = PS3/USB Cordless Gamepad
-platform = macosx
-
-[device]
-make = Logitech
-model = Cordless Precision
-type = gamepad
-
-[sdl]
-guid = 6d04000000000000d2ca000000000000
-buttons = 13
-hats = 1
-axes = 4
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_neg = rstick_left
-axis_2_pos = rstick_right
-axis_3_neg = rstick_up
-axis_3_pos = rstick_down
-button_0 = west_button
-button_1 = south_button
-button_10 = lstick_button
-button_11 = rstick_button
-button_12 = menu_button
-button_2 = east_button
-button_3 = north_button
-button_4 = left_shoulder
-button_5 = right_shoulder
-button_6 = left_trigger
-button_7 = right_trigger
-button_8 = select_button
-button_9 = start_button
-hat_0_down = dpad_down
-hat_0_left = dpad_left
-hat_0_right = dpad_right
-hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,23 @@
+[fs-uae-controller]
+name = Retro Joystick Adapter v2.0
+platform = macos
+
+[device]
+make = Retronic
+model = Joystick Adapter 2
+type = joystick
+
+[sdl]
+guid = 8117000000000000990a000000000000
+buttons = 3
+hats = 0
+axes = 2
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = dpad_left
+axis_0_pos = dpad_right
+axis_1_neg = dpad_up
+axis_1_pos = dpad_down
+button_0 = south_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/retro_joystick_adapter_v2_0_3_2_0_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-[fs-uae-controller]
-name = Retro Joystick Adapter v2.0
-platform = macosx
-
-[device]
-make = Retronic
-model = Joystick Adapter 2
-type = joystick
-
-[sdl]
-guid = 8117000000000000990a000000000000
-buttons = 3
-hats = 0
-axes = 2
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = dpad_left
-axis_0_pos = dpad_right
-axis_1_neg = dpad_up
-axis_1_pos = dpad_down
-button_0 = south_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,26 @@
+[fs-uae-controller]
+name = SPEED-LINK Competition Pro
+platform = macos
+
+[device]
+make = Speed-Link
+model = Competition Pro
+type = joystick
+
+[sdl]
+guid = 0b040000000000003365000000000000
+buttons = 4
+hats = 0
+axes = 2
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = dpad_left
+axis_0_pos = dpad_right
+axis_1_neg = dpad_up
+axis_1_pos = dpad_down
+button_0 = south_button
+button_1 = west_button
+button_2 = select_button
+button_3 = start_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/speed_link_competition_pro_4_2_0_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-[fs-uae-controller]
-name = SPEED-LINK Competition Pro
-platform = macosx
-
-[device]
-make = Speed-Link
-model = Competition Pro
-type = joystick
-
-[sdl]
-guid = 0b040000000000003365000000000000
-buttons = 4
-hats = 0
-axes = 2
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = dpad_left
-axis_0_pos = dpad_right
-axis_1_neg = dpad_up
-axis_1_pos = dpad_down
-button_0 = south_button
-button_1 = west_button
-button_2 = select_button
-button_3 = start_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/thrustmaster_dual_analog_3_2_12_4_1_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/thrustmaster_dual_analog_3_2_12_4_1_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/thrustmaster_dual_analog_3_2_12_4_1_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/thrustmaster_dual_analog_3_2_12_4_1_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,42 @@
+[fs-uae-controller]
+name = Thrustmaster dual analog 3.2
+platform = macos
+
+[device]
+make = Thrustmaster
+model = Dual Analog 4
+type = gamepad
+
+[sdl]
+guid = 4f0400000000000015b3000000000000
+buttons = 12
+hats = 1
+axes = 4
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_neg = rstick_left
+axis_2_pos = rstick_right
+axis_3_neg = rstick_up
+axis_3_pos = rstick_down
+button_0 = south_button
+button_1 = west_button
+button_10 = lstick_button
+button_11 = rstick_button
+button_2 = east_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = left_trigger
+button_6 = right_shoulder
+button_7 = right_trigger
+button_8 = select_button
+button_9 = start_button
+hat_0_down = dpad_down
+hat_0_left = dpad_left
+hat_0_right = dpad_right
+hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/thrustmaster_dual_analog_3_2_12_4_1_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/thrustmaster_dual_analog_3_2_12_4_1_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/thrustmaster_dual_analog_3_2_12_4_1_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/thrustmaster_dual_analog_3_2_12_4_1_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-[fs-uae-controller]
-name = Thrustmaster dual analog 3.2
-platform = macosx
-
-[device]
-make = Thrustmaster
-model = Dual Analog 4
-type = gamepad
-
-[sdl]
-guid = 4f0400000000000015b3000000000000
-buttons = 12
-hats = 1
-axes = 4
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_neg = rstick_left
-axis_2_pos = rstick_right
-axis_3_neg = rstick_up
-axis_3_pos = rstick_down
-button_0 = south_button
-button_1 = west_button
-button_10 = lstick_button
-button_11 = rstick_button
-button_2 = east_button
-button_3 = north_button
-button_4 = left_shoulder
-button_5 = left_trigger
-button_6 = right_shoulder
-button_7 = right_trigger
-button_8 = select_button
-button_9 = start_button
-hat_0_down = dpad_down
-hat_0_left = dpad_left
-hat_0_right = dpad_right
-hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,30 @@
+[fs-uae-controller]
+name = USB,2-axis 8-button gamepad
+platform = macos
+
+[device]
+make = iBuffalo
+model = SNES Pad
+type = gamepad
+
+[sdl]
+guid = 83050000000000006020000000000000
+buttons = 8
+hats = 0
+axes = 2
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = dpad_left
+axis_0_pos = dpad_right
+axis_1_neg = dpad_up
+axis_1_pos = dpad_down
+button_0 = east_button
+button_1 = south_button
+button_2 = north_button
+button_3 = west_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = select_button
+button_7 = start_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_macosx.conf	2016-04-01 14:54:04.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/usb_2_axis_8_button_gamepad_8_2_0_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-[fs-uae-controller]
-name = USB,2-axis 8-button gamepad
-platform = macosx
-
-[device]
-make = iBuffalo
-model = SNES Pad
-type = gamepad
-
-[sdl]
-guid = 83050000000000006020000000000000
-buttons = 8
-hats = 0
-axes = 2
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = dpad_left
-axis_0_pos = dpad_right
-axis_1_neg = dpad_up
-axis_1_pos = dpad_down
-button_0 = east_button
-button_1 = south_button
-button_2 = north_button
-button_3 = west_button
-button_4 = left_shoulder
-button_5 = right_shoulder
-button_6 = select_button
-button_7 = start_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/wireless_360_controller_15_6_0_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/wireless_360_controller_15_6_0_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/wireless_360_controller_15_6_0_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/wireless_360_controller_15_6_0_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,43 @@
+[fs-uae-controller]
+name = Wireless 360 Controller
+platform = macos
+
+[device]
+make = Microsoft
+model = Xbox 360 Pad
+type = gamepad
+
+[sdl]
+guid = 5e040000000000008e02000000000000
+buttons = 15
+hats = 0
+axes = 6
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_pos = left_trigger
+axis_3_neg = rstick_left
+axis_3_pos = rstick_right
+axis_4_neg = rstick_up
+axis_4_pos = rstick_down
+axis_5_pos = right_trigger
+button_0 = south_button
+button_1 = east_button
+button_10 = menu_button
+button_11 = dpad_up
+button_12 = dpad_down
+button_13 = dpad_left
+button_14 = dpad_right
+button_2 = west_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = lstick_button
+button_7 = rstick_button
+button_8 = start_button
+button_9 = select_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/wireless_360_controller_15_6_0_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/wireless_360_controller_15_6_0_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/wireless_360_controller_15_6_0_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/wireless_360_controller_15_6_0_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-[fs-uae-controller]
-name = Wireless 360 Controller
-platform = macosx
-
-[device]
-make = Microsoft
-model = Xbox 360 Pad
-type = gamepad
-
-[sdl]
-guid = 5e040000000000008e02000000000000
-buttons = 15
-hats = 0
-axes = 6
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_pos = left_trigger
-axis_3_neg = rstick_left
-axis_3_pos = rstick_right
-axis_4_neg = rstick_up
-axis_4_pos = rstick_down
-axis_5_pos = right_trigger
-button_0 = south_button
-button_1 = east_button
-button_10 = menu_button
-button_11 = dpad_up
-button_12 = dpad_down
-button_13 = dpad_left
-button_14 = dpad_right
-button_2 = west_button
-button_3 = north_button
-button_4 = left_shoulder
-button_5 = right_shoulder
-button_6 = lstick_button
-button_7 = rstick_button
-button_8 = start_button
-button_9 = select_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/wireless_controller_14_6_1_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/wireless_controller_14_6_1_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/wireless_controller_14_6_1_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/wireless_controller_14_6_1_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,43 @@
+[fs-uae-controller]
+name = Wireless Controller
+platform = macos
+
+[device]
+make = Sony
+model = DualShock 4
+type = gamepad
+
+[sdl]
+guid = 4c05000000000000c405000000000000
+buttons = 14
+hats = 1
+axes = 6
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_neg = rstick_left
+axis_2_pos = rstick_right
+axis_5_neg = rstick_up
+axis_5_pos = rstick_down
+button_0 = west_button
+button_1 = south_button
+button_10 = lstick_button
+button_11 = rstick_button
+button_12 = menu_button
+button_2 = east_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = left_trigger
+button_7 = right_trigger
+button_8 = select_button
+button_9 = start_button
+hat_0_down = dpad_down
+hat_0_left = dpad_left
+hat_0_right = dpad_right
+hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/wireless_controller_14_6_1_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/wireless_controller_14_6_1_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/wireless_controller_14_6_1_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/wireless_controller_14_6_1_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-[fs-uae-controller]
-name = Wireless Controller
-platform = macosx
-
-[device]
-make = Sony
-model = DualShock 4
-type = gamepad
-
-[sdl]
-guid = 4c05000000000000c405000000000000
-buttons = 14
-hats = 1
-axes = 6
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_neg = rstick_left
-axis_2_pos = rstick_right
-axis_5_neg = rstick_up
-axis_5_pos = rstick_down
-button_0 = west_button
-button_1 = south_button
-button_10 = lstick_button
-button_11 = rstick_button
-button_12 = menu_button
-button_2 = east_button
-button_3 = north_button
-button_4 = left_shoulder
-button_5 = right_shoulder
-button_6 = left_trigger
-button_7 = right_trigger
-button_8 = select_button
-button_9 = start_button
-hat_0_down = dpad_down
-hat_0_left = dpad_left
-hat_0_right = dpad_right
-hat_0_up = dpad_up
diff -Nru fs-uae-2.8.2/share/fs-uae/input/x360controller_16_6_0_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/x360controller_16_6_0_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/x360controller_16_6_0_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/x360controller_16_6_0_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,43 @@
+[fs-uae-controller]
+name = X360Controller
+platform = macos
+
+[device]
+make = Microsoft
+model = Xbox One Pad
+type = gamepad
+
+[sdl]
+guid = 5e040000000000008e02000000000000
+buttons = 16
+hats = 0
+axes = 6
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_pos = left_trigger
+axis_3_neg = rstick_left
+axis_3_pos = rstick_right
+axis_4_neg = rstick_up
+axis_4_pos = rstick_down
+axis_5_pos = right_trigger
+button_0 = south_button
+button_1 = east_button
+button_11 = dpad_up
+button_12 = dpad_down
+button_13 = dpad_left
+button_14 = dpad_right
+button_15 = menu_button
+button_2 = west_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = lstick_button
+button_7 = rstick_button
+button_8 = start_button
+button_9 = select_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/x360controller_16_6_0_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/x360controller_16_6_0_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/x360controller_16_6_0_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/x360controller_16_6_0_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-[fs-uae-controller]
-name = X360Controller
-platform = macosx
-
-[device]
-make = Microsoft
-model = Xbox One Pad
-type = gamepad
-
-[sdl]
-guid = 5e040000000000008e02000000000000
-buttons = 16
-hats = 0
-axes = 6
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_pos = left_trigger
-axis_3_neg = rstick_left
-axis_3_pos = rstick_right
-axis_4_neg = rstick_up
-axis_4_pos = rstick_down
-axis_5_pos = right_trigger
-button_0 = south_button
-button_1 = east_button
-button_11 = dpad_up
-button_12 = dpad_down
-button_13 = dpad_left
-button_14 = dpad_right
-button_15 = menu_button
-button_2 = west_button
-button_3 = north_button
-button_4 = left_shoulder
-button_5 = right_shoulder
-button_6 = lstick_button
-button_7 = rstick_button
-button_8 = start_button
-button_9 = select_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/xbox_360_wired_controller_15_6_0_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/xbox_360_wired_controller_15_6_0_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/xbox_360_wired_controller_15_6_0_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/xbox_360_wired_controller_15_6_0_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,43 @@
+[fs-uae-controller]
+name = Xbox 360 Wired Controller
+platform = macos
+
+[device]
+make = Microsoft
+model = Xbox 360 Pad
+type = gamepad
+
+[sdl]
+guid = 5e040000000000008e02000000000000
+buttons = 15
+hats = 0
+axes = 6
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_pos = left_trigger
+axis_3_neg = rstick_left
+axis_3_pos = rstick_right
+axis_4_neg = rstick_up
+axis_4_pos = rstick_down
+axis_5_pos = right_trigger
+button_0 = south_button
+button_1 = east_button
+button_10 = menu_button
+button_11 = dpad_up
+button_12 = dpad_down
+button_13 = dpad_left
+button_14 = dpad_right
+button_2 = west_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = lstick_button
+button_7 = rstick_button
+button_8 = start_button
+button_9 = select_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/xbox_360_wired_controller_15_6_0_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/xbox_360_wired_controller_15_6_0_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/xbox_360_wired_controller_15_6_0_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/xbox_360_wired_controller_15_6_0_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-[fs-uae-controller]
-name = Xbox 360 Wired Controller
-platform = macosx
-
-[device]
-make = Microsoft
-model = Xbox 360 Pad
-type = gamepad
-
-[sdl]
-guid = 5e040000000000008e02000000000000
-buttons = 15
-hats = 0
-axes = 6
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_pos = left_trigger
-axis_3_neg = rstick_left
-axis_3_pos = rstick_right
-axis_4_neg = rstick_up
-axis_4_pos = rstick_down
-axis_5_pos = right_trigger
-button_0 = south_button
-button_1 = east_button
-button_10 = menu_button
-button_11 = dpad_up
-button_12 = dpad_down
-button_13 = dpad_left
-button_14 = dpad_right
-button_2 = west_button
-button_3 = north_button
-button_4 = left_shoulder
-button_5 = right_shoulder
-button_6 = lstick_button
-button_7 = rstick_button
-button_8 = start_button
-button_9 = select_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/xbox_one_wired_controller_15_6_0_0_macos.conf fs-uae-2.8.3/share/fs-uae/input/xbox_one_wired_controller_15_6_0_0_macos.conf
--- fs-uae-2.8.2/share/fs-uae/input/xbox_one_wired_controller_15_6_0_0_macos.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/xbox_one_wired_controller_15_6_0_0_macos.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,43 @@
+[fs-uae-controller]
+name = Xbox One Wired Controller
+platform = macos
+
+[device]
+make = Microsoft
+model = Xbox One Pad
+type = gamepad
+
+[sdl]
+guid = 5e040000000000008e02000000000000
+buttons = 15
+hats = 0
+axes = 6
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_pos = left_trigger
+axis_3_neg = rstick_left
+axis_3_pos = rstick_right
+axis_4_neg = rstick_up
+axis_4_pos = rstick_down
+axis_5_pos = right_trigger
+button_0 = south_button
+button_1 = east_button
+button_10 = menu_button
+button_11 = dpad_up
+button_12 = dpad_down
+button_13 = dpad_left
+button_14 = dpad_right
+button_2 = west_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = lstick_button
+button_7 = rstick_button
+button_8 = start_button
+button_9 = select_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/xbox_one_wired_controller_15_6_0_0_macosx.conf fs-uae-2.8.3/share/fs-uae/input/xbox_one_wired_controller_15_6_0_0_macosx.conf
--- fs-uae-2.8.2/share/fs-uae/input/xbox_one_wired_controller_15_6_0_0_macosx.conf	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/xbox_one_wired_controller_15_6_0_0_macosx.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-[fs-uae-controller]
-name = Xbox One Wired Controller
-platform = macosx
-
-[device]
-make = Microsoft
-model = Xbox One Pad
-type = gamepad
-
-[sdl]
-guid = 5e040000000000008e02000000000000
-buttons = 15
-hats = 0
-axes = 6
-balls = 0
-
-[default]
-include = universal_gamepad
-axis_0_neg = lstick_left
-axis_0_pos = lstick_right
-axis_1_neg = lstick_up
-axis_1_pos = lstick_down
-axis_2_pos = left_trigger
-axis_3_neg = rstick_left
-axis_3_pos = rstick_right
-axis_4_neg = rstick_up
-axis_4_pos = rstick_down
-axis_5_pos = right_trigger
-button_0 = south_button
-button_1 = east_button
-button_10 = menu_button
-button_11 = dpad_up
-button_12 = dpad_down
-button_13 = dpad_left
-button_14 = dpad_right
-button_2 = west_button
-button_3 = north_button
-button_4 = left_shoulder
-button_5 = right_shoulder
-button_6 = lstick_button
-button_7 = rstick_button
-button_8 = start_button
-button_9 = select_button
diff -Nru fs-uae-2.8.2/share/fs-uae/input/xinput_controller_11_6_1_0_windows.conf fs-uae-2.8.3/share/fs-uae/input/xinput_controller_11_6_1_0_windows.conf
--- fs-uae-2.8.2/share/fs-uae/input/xinput_controller_11_6_1_0_windows.conf	1970-01-01 00:00:00.000000000 +0000
+++ fs-uae-2.8.3/share/fs-uae/input/xinput_controller_11_6_1_0_windows.conf	2016-12-27 21:06:04.000000000 +0000
@@ -0,0 +1,42 @@
+[fs-uae-controller]
+name = XInput Controller
+platform = windows
+
+[device]
+make = XInput
+model = Controller
+type = gamepad
+
+[sdl]
+guid = 78696e70757401000000000000000000
+buttons = 11
+hats = 1
+axes = 6
+balls = 0
+
+[default]
+include = universal_gamepad
+axis_0_neg = lstick_left
+axis_0_pos = lstick_right
+axis_1_neg = lstick_up
+axis_1_pos = lstick_down
+axis_2_pos = left_trigger
+axis_3_neg = rstick_left
+axis_3_pos = rstick_right
+axis_4_neg = rstick_up
+axis_4_pos = rstick_down
+axis_5_pos = right_trigger
+button_0 = south_button
+button_1 = east_button
+button_2 = west_button
+button_3 = north_button
+button_4 = left_shoulder
+button_5 = right_shoulder
+button_6 = select_button
+button_7 = start_button
+button_8 = lstick_button
+button_9 = rstick_button
+hat_0_down = dpad_down
+hat_0_left = dpad_left
+hat_0_right = dpad_right
+hat_0_up = dpad_up
Binary files /tmp/tmpsrw1RD/vbjr11EDpS/fs-uae-2.8.2/share/icons/hicolor/128x128/apps/fs-uae.png and /tmp/tmpsrw1RD/aKADNnXWtI/fs-uae-2.8.3/share/icons/hicolor/128x128/apps/fs-uae.png differ
Binary files /tmp/tmpsrw1RD/vbjr11EDpS/fs-uae-2.8.2/share/icons/hicolor/22x22/apps/fs-uae.png and /tmp/tmpsrw1RD/aKADNnXWtI/fs-uae-2.8.3/share/icons/hicolor/22x22/apps/fs-uae.png differ
Binary files /tmp/tmpsrw1RD/vbjr11EDpS/fs-uae-2.8.2/share/icons/hicolor/24x24/apps/fs-uae.png and /tmp/tmpsrw1RD/aKADNnXWtI/fs-uae-2.8.3/share/icons/hicolor/24x24/apps/fs-uae.png differ
Binary files /tmp/tmpsrw1RD/vbjr11EDpS/fs-uae-2.8.2/share/icons/hicolor/256x256/apps/fs-uae.png and /tmp/tmpsrw1RD/aKADNnXWtI/fs-uae-2.8.3/share/icons/hicolor/256x256/apps/fs-uae.png differ
Binary files /tmp/tmpsrw1RD/vbjr11EDpS/fs-uae-2.8.2/share/icons/hicolor/32x32/apps/fs-uae.png and /tmp/tmpsrw1RD/aKADNnXWtI/fs-uae-2.8.3/share/icons/hicolor/32x32/apps/fs-uae.png differ
Binary files /tmp/tmpsrw1RD/vbjr11EDpS/fs-uae-2.8.2/share/icons/hicolor/48x48/apps/fs-uae.png and /tmp/tmpsrw1RD/aKADNnXWtI/fs-uae-2.8.3/share/icons/hicolor/48x48/apps/fs-uae.png differ
Binary files /tmp/tmpsrw1RD/vbjr11EDpS/fs-uae-2.8.2/share/icons/hicolor/64x64/apps/fs-uae.png and /tmp/tmpsrw1RD/aKADNnXWtI/fs-uae-2.8.3/share/icons/hicolor/64x64/apps/fs-uae.png differ
diff -Nru fs-uae-2.8.2/src/od-fs/fsdb_host.cpp fs-uae-2.8.3/src/od-fs/fsdb_host.cpp
--- fs-uae-2.8.2/src/od-fs/fsdb_host.cpp	2015-12-22 18:59:19.000000000 +0000
+++ fs-uae-2.8.3/src/od-fs/fsdb_host.cpp	2017-01-07 17:53:00.000000000 +0000
@@ -312,21 +312,39 @@
 
 static char *nname_to_aname(const char *nname, int noconvert)
 {
+    char *cresult;
     int len = strlen(nname);
-    char *result = strdup(nname);
+    if (noconvert) {
+        cresult = strdup(nname);
+    } else {
+        cresult = fs_utf8_to_latin1(nname, -1);
+//        free(result);
+    }
+
+    if (!cresult) {
+        write_log("[WARNING] nname_to_aname %s => Failed\n", nname);
+        return NULL;
+    }
+
+    char *result = strdup(cresult);
     unsigned char *p = (unsigned char *) result;
     for (int i = 0; i < len; i++) {
-        unsigned char c = nname[i];
+        unsigned char c = cresult[i];
         if (c == '%' && i < len - 2) {
-            *p++ = (char_to_hex(nname[i + 1]) << 4) | char_to_hex(nname[i + 2]);
+            *p++ = (char_to_hex(cresult[i + 1]) << 4) |
+                    char_to_hex(cresult[i + 2]);
             i += 2;
-        }
-        else {
+        } else {
             *p++ = c;
         }
     }
     *p++ = '\0';
-
+    free(cresult);
+    if (g_fsdb_debug) {
+        write_log("nname_to_aname %s => %s\n", nname, result);
+    }
+    return result;
+/*
     if (noconvert) {
         return result;
     }
@@ -334,15 +352,15 @@
     char* cresult = fs_utf8_to_latin1(result, -1);
     free(result);
 
-    if (g_fsdb_debug) {
-        if (cresult) {
+    if (cresult) {
+        if (g_fsdb_debug) {
             write_log("nname_to_aname %s => %s\n", nname, cresult);
         }
-        else {
-            write_log("nname_to_aname %s => Failed\n", nname);
-        }
+    } else {
+        write_log("[WARNING] nname_to_aname %s => Failed\n", nname);
     }
     return cresult;
+*/
 }
 
 /* Return nonzero if we can represent the amigaos_mode of AINO within the
diff -Nru fs-uae-2.8.2/src/od-fs/input.cpp fs-uae-2.8.3/src/od-fs/input.cpp
--- fs-uae-2.8.2/src/od-fs/input.cpp	2016-09-14 20:38:25.000000000 +0000
+++ fs-uae-2.8.3/src/od-fs/input.cpp	2017-01-07 17:51:13.000000000 +0000
@@ -75,13 +75,11 @@
 
 int amiga_send_input_event(int input_event, int state)
 {
+    static bool caps_lock_state;
+
 //#ifdef DEBUG_SYNC
     write_sync_log("apply action %d state=%d\n", input_event, state);
 //#endif
-    static int initialized = 0;
-    if (!initialized) {
-        initialized = 1;
-    }
 
     if (g_fs_log_input) {
         write_log("amiga_send_input_event %d %d\n", input_event, state);
@@ -90,8 +88,8 @@
     if (input_event > INPUTEVENT_PRIVATE_START) {
         return handle_custom_action(input_event, state);
     }
-    // FIXME: is max = 1 always appropriate?
-    int max = 1;
+
+    int max = 1;  /* FIXME: is max = 1 always appropriate? */
     bool magic_mouse = currprefs.input_magic_mouse;
     if (uae_deterministic_mode()) {
         magic_mouse = false;
@@ -114,11 +112,19 @@
         max = 0;
         break;
     case INPUTEVENT_KEY_CAPS_LOCK:
+        if (state && !caps_lock_state) {
+            caps_lock_state = true;
+        } else if (state && caps_lock_state) {
+            caps_lock_state = false;
+        }
+        state = caps_lock_state;
+#if 0
         // handled specially because of toggle mode
         // keyboard 0, using input event as scan code (correctly mapped
         // in keymap.cpp)
         inputdevice_translatekeycode(0, INPUTEVENT_KEY_CAPS_LOCK, state);
         return 1;
+#endif
     }
     int autofire = 0;