diff --git a/jni/pjproject-android/pjsip/src/pjsip-simple/errno.c b/jni/pjproject-android/pjsip/src/pjsip-simple/errno.c
index e1bdb95..91a066d 100644
--- a/jni/pjproject-android/pjsip/src/pjsip-simple/errno.c
+++ b/jni/pjproject-android/pjsip/src/pjsip-simple/errno.c
@@ -1,4 +1,4 @@
-/* $Id: errno.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/pjsip-simple/evsub.c b/jni/pjproject-android/pjsip/src/pjsip-simple/evsub.c
index 94d12be..aa2498c 100644
--- a/jni/pjproject-android/pjsip/src/pjsip-simple/evsub.c
+++ b/jni/pjproject-android/pjsip/src/pjsip-simple/evsub.c
@@ -1,4 +1,4 @@
-/* $Id: evsub.c 4447 2013-03-21 08:28:21Z nanang $ */
+/* $Id$ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -32,6 +32,7 @@
 #include <pj/log.h>
 #include <pj/os.h>
 #include <pj/pool.h>
+#include <pj/rand.h>
 #include <pj/string.h>
 
 
@@ -1749,6 +1750,10 @@
 		unsigned timeout = (sub->expires->ivalue > TIME_UAC_REFRESH) ?
 		    sub->expires->ivalue - TIME_UAC_REFRESH : sub->expires->ivalue;
 
+		/* Reduce timeout by about 1 - 10 secs (randomized) */
+		if (timeout > 10)
+		    timeout += -10 + (pj_rand() % 10);
+
 		PJ_LOG(5,(sub->obj_name, "Will refresh in %d seconds", 
 			  timeout));
 		set_timer(sub, TIMER_TYPE_UAC_REFRESH, timeout);
diff --git a/jni/pjproject-android/pjsip/src/pjsip-simple/evsub_msg.c b/jni/pjproject-android/pjsip/src/pjsip-simple/evsub_msg.c
index fc9f093..b44a715 100644
--- a/jni/pjproject-android/pjsip/src/pjsip-simple/evsub_msg.c
+++ b/jni/pjproject-android/pjsip/src/pjsip-simple/evsub_msg.c
@@ -1,4 +1,4 @@
-/* $Id: evsub_msg.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/pjsip-simple/iscomposing.c b/jni/pjproject-android/pjsip/src/pjsip-simple/iscomposing.c
index 7053539..18fd1f5 100644
--- a/jni/pjproject-android/pjsip/src/pjsip-simple/iscomposing.c
+++ b/jni/pjproject-android/pjsip/src/pjsip-simple/iscomposing.c
@@ -1,4 +1,4 @@
-/* $Id: iscomposing.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/pjsip-simple/mwi.c b/jni/pjproject-android/pjsip/src/pjsip-simple/mwi.c
index da86131..537ca9e 100644
--- a/jni/pjproject-android/pjsip/src/pjsip-simple/mwi.c
+++ b/jni/pjproject-android/pjsip/src/pjsip-simple/mwi.c
@@ -1,4 +1,4 @@
-/* $Id: mwi.c 4172 2012-06-19 14:35:18Z nanang $ */
+/* $Id$ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/pjsip-simple/pidf.c b/jni/pjproject-android/pjsip/src/pjsip-simple/pidf.c
index 0b68d1a..b90725d 100644
--- a/jni/pjproject-android/pjsip/src/pjsip-simple/pidf.c
+++ b/jni/pjproject-android/pjsip/src/pjsip-simple/pidf.c
@@ -1,4 +1,4 @@
-/* $Id: pidf.c 3841 2011-10-24 09:28:13Z ming $ */
+/* $Id$ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/pjsip-simple/presence.c b/jni/pjproject-android/pjsip/src/pjsip-simple/presence.c
index 5b96ec7..2e94e93 100644
--- a/jni/pjproject-android/pjsip/src/pjsip-simple/presence.c
+++ b/jni/pjproject-android/pjsip/src/pjsip-simple/presence.c
@@ -1,4 +1,4 @@
-/* $Id: presence.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/pjsip-simple/presence_body.c b/jni/pjproject-android/pjsip/src/pjsip-simple/presence_body.c
index e692f47..221228e 100644
--- a/jni/pjproject-android/pjsip/src/pjsip-simple/presence_body.c
+++ b/jni/pjproject-android/pjsip/src/pjsip-simple/presence_body.c
@@ -1,4 +1,4 @@
-/* $Id: presence_body.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/pjsip-simple/publishc.c b/jni/pjproject-android/pjsip/src/pjsip-simple/publishc.c
index 0048bc6..fcb412d 100644
--- a/jni/pjproject-android/pjsip/src/pjsip-simple/publishc.c
+++ b/jni/pjproject-android/pjsip/src/pjsip-simple/publishc.c
@@ -1,4 +1,4 @@
-/* $Id: publishc.c 4530 2013-05-30 09:27:49Z nanang $ */
+/* $Id$ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/pjsip-simple/rpid.c b/jni/pjproject-android/pjsip/src/pjsip-simple/rpid.c
index 8e63205..f02b137 100644
--- a/jni/pjproject-android/pjsip/src/pjsip-simple/rpid.c
+++ b/jni/pjproject-android/pjsip/src/pjsip-simple/rpid.c
@@ -1,4 +1,4 @@
-/* $Id: rpid.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip/src/pjsip-simple/xpidf.c b/jni/pjproject-android/pjsip/src/pjsip-simple/xpidf.c
index 22801d7..4ca4b29 100644
--- a/jni/pjproject-android/pjsip/src/pjsip-simple/xpidf.c
+++ b/jni/pjproject-android/pjsip/src/pjsip-simple/xpidf.c
@@ -1,4 +1,4 @@
-/* $Id: xpidf.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>