diff --git a/srcpkgs/celestia-gtk/patches/fix-stdint_redefine.patch b/srcpkgs/celestia-gtk/patches/fix-stdint_redefine.patch
new file mode 100644
index 00000000000..81e480a6c4b
--- /dev/null
+++ b/srcpkgs/celestia-gtk/patches/fix-stdint_redefine.patch
@@ -0,0 +1,12 @@
+--- 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-gtk/template b/srcpkgs/celestia-gtk/template
index a5c7f3d1efc..0dcc6650286 100644
--- a/srcpkgs/celestia-gtk/template
+++ b/srcpkgs/celestia-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'celestia-gtk'
 pkgname=celestia-gtk
 version=1.6.1
-revision=3
+revision=4
 short_desc="free space simulation using GTK"
 maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2"
@@ -18,6 +18,9 @@ wrksrc=celestia-${version}
 provides="celestia-${version}_${revision}"
 replaces="celestia>=0"
 
-do_build() {
-	make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="-lpng -ljpeg -llua5.1 -lgtkglext-x11-1.0 -lgdkglext-x11-1.0 -logg -ltheora -lz -ldl -pthread"
+do_configure() {
+	local _gtk_libs=$(pkg-config --libs gtkglext-x11-1.0)
+	CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+	LIBS="-lpng -ljpeg -llua5.1 ${_gtk_libs} -logg -ltheora -lz -ldl" \
+		./configure ${configure_args}
 }