diff --git a/srcpkgs/celestia-glut/patches/fix-stdint_redefine.patch b/srcpkgs/celestia-glut/patches/fix-stdint_redefine.patch
new file mode 100644
index 0000000000..2bd7de986d
--- /dev/null
+++ b/srcpkgs/celestia-glut/patches/fix-stdint_redefine.patch
@@ -0,0 +1,14 @@
+Do not try to redefine INT64_MAX, if it is already defined.
+
+--- src/celutil/basictypes.h	2011-06-05 18:11:15.000000000 +0200
++++ src/celutil/basictypes.h	2016-09-02 17:41:33.335187908 +0200
+@@ -31,7 +31,9 @@
+ #include <limits>
+ typedef          int64_t int64;
+ typedef         uint64_t uint64;
++#ifndef INT64_MAX
+ #define INT64_MAX 9223372036854775807LL
++#endif
+ #ifndef UINT64_MAX
+ #define UINT64_MAX 0xffffffffffffffffULL
+ #endif
diff --git a/srcpkgs/celestia-glut/template b/srcpkgs/celestia-glut/template
index 97b48e4a78..b769e6e274 100644
--- a/srcpkgs/celestia-glut/template
+++ b/srcpkgs/celestia-glut/template
@@ -1,7 +1,7 @@
 # Template file for 'celestia-glut'
 pkgname=celestia-glut
 version=1.6.1
-revision=3
+revision=4
 short_desc="free space simulation using GLUT"
 maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2"
@@ -18,5 +18,6 @@ provides="celestia-${version}_${revision}"
 replaces="celestia>=0"
 
 do_build() {
-	make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="-lpng -ljpeg -llua5.1 -lglut -lGLU -lGL -logg -ltheora -lz -ldl -pthread"
+	local _libs="-lpng -ljpeg -llua5.1 -lglut -lGLU -lGL -logg -ltheora -lz -ldl"
+	make ${makejobs} CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="${LDFLAGS} ${_libs} -pthread"
 }