diff --git a/0ad-mozjs-no-minor-check.patch b/0ad-mozjs-incompatible.patch
similarity index 57%
rename from 0ad-mozjs-no-minor-check.patch
rename to 0ad-mozjs-incompatible.patch
index 114ac78..3d1d91a 100644
--- a/0ad-mozjs-no-minor-check.patch
+++ b/0ad-mozjs-incompatible.patch
@@ -21,3 +21,18 @@ diff -uNr 0ad-0.0.21-alpha.orig/source/scriptinterface/ScriptTypes.h 0ad-0.0.21-
  class ScriptInterface;
  
  #endif // INCLUDED_SCRIPTTYPES
+diff -uNr 0ad-0.0.21-alpha.orig/source/simulation2/serialization/BinarySerializer.cpp 0ad-0.0.21-alpha/source/simulation2/serialization/BinarySerializer.cpp
+--- 0ad-0.0.21-alpha.orig/source/simulation2/serialization/BinarySerializer.cpp	2016-09-18 11:34:45.000000000 +0200
++++ 0ad-0.0.21-alpha/source/simulation2/serialization/BinarySerializer.cpp	2016-11-09 07:29:10.293824242 +0100
+@@ -145,11 +145,7 @@
+ 			const JSClass* jsclass = JS_GetClass(obj);
+ 			if (!jsclass)
+ 				throw PSERROR_Serialize_ScriptError("JS_GetClass failed");
+-// TODO: Remove this workaround for upstream API breakage when updating SpiderMonkey
+-// See https://bugzilla.mozilla.org/show_bug.cgi?id=1236373
+-#define JSCLASS_CACHED_PROTO_WIDTH js::JSCLASS_CACHED_PROTO_WIDTH
+ 			JSProtoKey protokey = JSCLASS_CACHED_PROTO_KEY(jsclass);
+-#undef JSCLASS_CACHED_PROTO_WIDTH
+ 
+ 			if (protokey == JSProto_Object)
+ 			{
diff --git a/0ad.spec b/0ad.spec
index f19fcfa..eaa20a7 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -107,7 +107,8 @@ Patch1:		%{name}-debug.patch
 Patch3:		%{name}-valgrind.patch
 
 # We have don't want to ensure that we have 38.3.x of mozjs (we just don't have it)
-Patch4:     %{name}-mozjs-no-minor-check.patch
+# And other fixes
+Patch4:     %{name}-mozjs-incompatible.patch
 
 %description
 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform