diff -Nru klystrack-0.20171212/debian/changelog klystrack-0.20171212/debian/changelog
--- klystrack-0.20171212/debian/changelog	2017-12-12 14:02:26.000000000 +0000
+++ klystrack-0.20171212/debian/changelog	2018-01-08 08:03:36.000000000 +0000
@@ -1,3 +1,11 @@
+klystrack (0.20171212-2) unstable; urgency=medium
+
+  * Upstream patch to fix building problems. (Closes: #886375)
+  * Bump standards version to 4.1.3.
+  * Bump debhelper version to 11.
+
+ -- Gürkan Myczko <gurkan@phys.ethz.ch>  Mon, 08 Jan 2018 09:03:36 +0100
+
 klystrack (0.20171212-1) unstable; urgency=medium
 
   * Initial release (Closes: #884279)
diff -Nru klystrack-0.20171212/debian/compat klystrack-0.20171212/debian/compat
--- klystrack-0.20171212/debian/compat	2017-12-12 14:02:26.000000000 +0000
+++ klystrack-0.20171212/debian/compat	2018-01-08 08:03:36.000000000 +0000
@@ -1 +1 @@
-10
+11
diff -Nru klystrack-0.20171212/debian/control klystrack-0.20171212/debian/control
--- klystrack-0.20171212/debian/control	2017-12-12 14:02:26.000000000 +0000
+++ klystrack-0.20171212/debian/control	2018-01-08 08:03:36.000000000 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Multimedia Packages Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
 Uploaders: Gürkan Myczko <gurkan@phys.ethz.ch>
-Build-Depends: debhelper (>= 10), libsdl2-image-dev, libsdl2-dev
-Standards-Version: 4.1.2
+Build-Depends: debhelper (>= 11), libsdl2-image-dev, libsdl2-dev
+Standards-Version: 4.1.3
 Homepage: https://github.com/kometbomb/klystrack
 
 Package: klystrack
diff -Nru klystrack-0.20171212/debian/patches/series klystrack-0.20171212/debian/patches/series
--- klystrack-0.20171212/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ klystrack-0.20171212/debian/patches/series	2018-01-08 08:03:36.000000000 +0000
@@ -0,0 +1 @@
+upstream-build-fix
diff -Nru klystrack-0.20171212/debian/patches/upstream-build-fix klystrack-0.20171212/debian/patches/upstream-build-fix
--- klystrack-0.20171212/debian/patches/upstream-build-fix	1970-01-01 00:00:00.000000000 +0000
+++ klystrack-0.20171212/debian/patches/upstream-build-fix	2018-01-08 08:03:36.000000000 +0000
@@ -0,0 +1,61 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ klystrack (0.20171212-2) unstable; urgency=medium
+ .
+   * Upstream patch to fix building problems. (Closes: #886375)
+   * Bump standards version to 4.1.3.
+   * Bump debhelper version to 11.
+Author: Gürkan Myczko <gurkan@phys.ethz.ch>
+Bug-Debian: https://bugs.debian.org/886375
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2018-01-08
+
+--- klystrack-0.20171212.orig/klystron/src/macros.h
++++ klystrack-0.20171212/klystron/src/macros.h
+@@ -39,8 +39,8 @@ OTHER DEALINGS IN THE SOFTWARE.
+ 	if ((((Uint16)file_version) >= ((Uint16)first_version)) && (((Uint16)file_version) <= ((Uint16)last_version)))\
+ 	{\
+ 		block;\
+-	} 
+-	
++	}
++
+ #define VER_READ(file_version, first_version, last_version, var, size) VER(file_version, first_version, last_version, SDL_RWread(ctx, var, !size ? sizeof(*var) : size, 1));
+ #define _VER_READ(x, size) VER_READ(version, 0, MUS_VERSION, x, size)
+ #define _VER_WRITE(x, size) fwrite(x, !size ? sizeof(*x) : size, 1, f)
+@@ -85,17 +85,8 @@ OTHER DEALINGS IN THE SOFTWARE.
+ // Makes "warning: cast to pointer from integer of different size" disappear
+ 
+ #define CASTPTR(t,x) (*(t*)&x)
+-#ifdef __i386__
+-#  define CASTTOPTR(t,x) (t*)x
+-#else
+-#  define CASTTOPTR(t,x) (t*)(Uint64)x
+-#endif
+-
+-#if __i386__
+-#define MAKEPTR(x) ((void*)(Uint32)(x))
+-#else
+-#define MAKEPTR(x) ((void*)(Uint64)(x))
+-#endif
++#define CASTTOPTR(t,x) (t*)(uintptr_t)x
++#define MAKEPTR(x) ((void*)(uintptr_t)(x))
+ 
+ #define STRINGIFY(x) #x
+ #define TOSTRING(x) STRINGIFY(x)