diff --git a/pcsxr-1.9.94-SDLjoyoverflowbug.patch b/pcsxr-1.9.94-SDLjoyoverflowbug.patch
new file mode 100644
index 0000000..9dbd55d
--- /dev/null
+++ b/pcsxr-1.9.94-SDLjoyoverflowbug.patch
@@ -0,0 +1,12 @@
+diff -rupN a/plugins/dfinput/cfg-gtk.c b/plugins/dfinput/cfg-gtk.c
+--- a/plugins/dfinput/cfg-gtk.c	2013-11-09 16:24:16.000000000 -0500
++++ b/plugins/dfinput/cfg-gtk.c	2017-05-30 08:46:57.799501874 -0400
+@@ -607,7 +607,7 @@ static void PopulateDevList() {
+ 
+ 		n = SDL_NumJoysticks();
+ 		for (j = 0; j < n; j++) {
+-			sprintf(buf, "%d: %s", j + 1, SDL_JoystickName(j));
++			snprintf(buf, sizeof(buf), "%d: %s", j + 1, SDL_JoystickName(j));
+ 			gtk_list_store_append(store, &iter);
+ 			gtk_list_store_set(store, &iter, 0, buf, -1);
+ 		}
diff --git a/pcsxr.spec b/pcsxr.spec
index 8d8765a..7553d9d 100644
--- a/pcsxr.spec
+++ b/pcsxr.spec
@@ -2,7 +2,7 @@
 %undefine _hardened_build
 Name:           pcsxr
 Version:        1.9.94
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A plugin based PlayStation (PSX) emulator with high compatibility
 
 #All is GPLv2+ except:
@@ -22,6 +22,10 @@ Patch0:         %{name}-%{version}-missinginclude.patch
 #Fix for zlib 1.2.9+, backported from upstream PR:
 #https://pcsxr.codeplex.com/SourceControl/network/forks/mgorny/pcsxr/contribution/9061
 Patch1:         %{name}-%{version}-zlib129fix.patch
+#Submitted upstream in master:
+#https://pcsxr.codeplex.com/SourceControl/changeset/69e178589897f8f89cf52812537935134ed14fe4
+#https://pcsxr.codeplex.com/SourceControl/changeset/9f4f1ce8f87318b4503ecd0eb2763796b5505c6d
+Patch2:         %{name}-%{version}-SDLjoyoverflowbug.patch
 
 BuildRequires:  SDL2-devel
 BuildRequires:  gtk3-devel
@@ -85,6 +89,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_datadir}/appdata/*.appdata.xml
 
 %changelog
+* Tue May 30 2017 Jeremy Newton <alexjnewt AT hotmail DOT com> - 1.9.94-11
+- Backport fix for overflow issues
+
 * Sun Feb 12 2017 Jeremy Newton <alexjnewt AT hotmail DOT com> - 1.9.94-10
 - Backport fix for zlib-1.2.9+