diff --git a/mozilla/widget/timer/src/unix/photon/Makefile.in b/mozilla/widget/timer/src/unix/photon/Makefile.in
index da4512ef363..581656455ac 100644
--- a/mozilla/widget/timer/src/unix/photon/Makefile.in
+++ b/mozilla/widget/timer/src/unix/photon/Makefile.in
@@ -39,7 +39,7 @@ IS_COMPONENT	= 1
 EXPORT_LIBRARY = 1
 MODULE_NAME	= nsPhTimerModule
 CPPSRCS		+= nsTimerPhFactory.cpp
-EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
+EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS) $(TOOLKIT_DSO_LDOPTS) $(TK_LIBS) $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/widget/timer/src/unix/photon/nsTimerPh.cpp b/mozilla/widget/timer/src/unix/photon/nsTimerPh.cpp
index 1666ae260c4..b7cb2eb2d68 100644
--- a/mozilla/widget/timer/src/unix/photon/nsTimerPh.cpp
+++ b/mozilla/widget/timer/src/unix/photon/nsTimerPh.cpp
@@ -306,6 +306,10 @@ NS_METHOD nsTimerPh::SetupTimer()
 			return NS_ERROR_FAILURE;
 		}
 	}
+#ifdef DEBUG
+	if (mType == NS_TYPE_REPEATING_PRECISE)
+		mType = NS_TYPE_REPEATING_SLACK;
+#endif
 
 	switch(mType)
 	{