$OpenBSD$
--- toolkit/library/libxul-config.mk.orig	Tue Jan 11 04:27:37 2011
+++ toolkit/library/libxul-config.mk	Sat Jan 15 01:03:06 2011
@@ -366,12 +366,13 @@ EXTRA_DSO_LDOPTS += \
 	$(PNG_LIBS) \
 	$(QCMS_LIBS) \
 	$(MOZ_JS_LIBS) \
-	$(NSS_LIBS) \
 	$(MOZ_CAIRO_LIBS) \
 	$(MOZ_HARFBUZZ_LIBS) \
 	$(MOZ_OTS_LIBS) \
 	$(MOZ_APP_EXTRA_LIBS) \
 	$(NULL)
+
+OS_LIBS	+= $(NSS_LIBS)
 
 ifdef MOZ_NATIVE_ZLIB
 EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)