diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 9ed20bec2ac..b085d33d698 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2009/11/17 23:12:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2009/11/30 16:14:02 ajacoutot Exp $
 
 COMMENT=	free space simulator and planetarium
 
 DISTNAME=	celestia-1.6.0
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	astro x11
 
 HOMEPAGE=	http://www.shatters.net/celestia/
@@ -23,8 +23,7 @@ WANTLIB += Xext Xfixes Xi Xinerama Xmu Xrandr Xrender Xt atk-1.0
 WANTLIB += c cairo expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0
 WANTLIB += jpeg m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pangox-1.0
-WANTLIB += pcre pixman-1 png stdc++ z
-WANTLIB += pthread-stubs xcb
+WANTLIB += pcre pixman-1 png pthread pthread-stubs stdc++ xcb z
 
 MODULES=	devel/gettext
 LIB_DEPENDS=	gdkglext-x11-1.0,gtkglext-x11-1.0::x11/gtkglext \
@@ -46,6 +45,9 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--enable-cairo \
 		--enable-theora
 
+# /usr/local/lib/libgthread-2.0.so.X.X: undefined symbol 'pthread_mutex_trylock'
+CFLAGS+=	-pthread
+
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/src/celestia/celestiacore.cpp