diff --git a/3Depict-0.0.20-s390_preprocessor_fix.patch b/3Depict-0.0.20-s390_preprocessor_fix.patch
new file mode 100644
index 0000000..d716174
--- /dev/null
+++ b/3Depict-0.0.20-s390_preprocessor_fix.patch
@@ -0,0 +1,21 @@
+diff -r 522fed67ed37 src/backend/APT/APTFileIO.cpp
+--- src/backend/APT/APTFileIO.cpp	Mon Aug 28 13:47:41 2017 +0100
++++ src/backend/APT/APTFileIO.cpp	Mon Aug 28 13:49:44 2017 +0100
+@@ -956,7 +956,7 @@
+ 		ASSERT(forceEndian < 3);
+ #ifdef __LITTLE_ENDIAN__
+ 		endianFlip=(forceEndian == 2);
+-#elif __BIG_ENDIAN
++#elif defined(__BIG_ENDIAN__)
+ 		endianFlip=(forceEndian == 1);
+ #endif
+ 	}
+@@ -1225,7 +1225,7 @@
+ 
+ 			//assign the ID as the mass to charge
+ 			h.setMassToCharge(*( (short*)(buffer+12) ));
+-#elif __BIG_ENDIAN__
++#elif defined(__BIG_ENDIAN__)
+ 			{
+ 			Point3D pt((float*)(buffer));
+ 			pt.switchEndian();
diff --git a/3Depict.spec b/3Depict.spec
index 92936f0..3f496a0 100644
--- a/3Depict.spec
+++ b/3Depict.spec
@@ -40,8 +40,10 @@ Patch1: %{name}-%{version}-font-path.patch
 #Implementes tapsim loading for big-endian
 # this is to fix a failed scratch build on ppc64
 Patch2: %{name}-%{version}-tapsim-endian.patch
-#More fixes for ppc64 build failures
+#Fixes for ppc64 build failures
 Patch3: %{name}-%{version}-short_type_fix.patch
+#Fixes for S390 build failures
+Patch4: %{name}-%{version}-s390_preprocessor_fix.patch
 
 %description
 This software is designed to help users visualize and analyze 3D point clouds
@@ -57,16 +59,16 @@ useful for general scalar valued point data purposes.
 %patch1
 %patch2
 %patch3
+%patch4
 
-%if 0%{?fedora} > 24
-# Installation directory has changed
+# Change header locations, as installation directory 
+# is different from upstream
 sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \
   src/backend/filters/filterCommon.h \
   src/backend/filters/algorithms/spatial.cpp \
   configure configure.ac
-# Avoid rerunning the autotools
+# Avoid rerunning the autotools suite
 touch -r aclocal.m4 configure configure.ac
-%endif
 
 %build
 %configure --disable-debug-checks --enable-openmp-parallel