diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 6915fe71c6..0e6219555a 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Mon Jun  1 17:51:14 CDT 2009
+Thu Jun  4 16:10:50 CDT 2009
diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
index d1e734ae0a..d7e9da1ff8 100644
--- a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
+++ b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
@@ -1291,6 +1291,17 @@ static int offer_answer_step(soa_session_t *ss,
     if (user->sdp_origin)
       o->o_username = user->sdp_origin->o_username;
 
+	if (user->sdp_origin->o_address)
+	  o->o_address = user->sdp_origin->o_address;
+
+    if (user->sdp_origin->o_id)
+		o->o_id = user->sdp_origin->o_id;
+
+	if (user->sdp_origin->o_version && user->sdp_origin->o_version != o->o_version) {
+		o->o_version = user->sdp_origin->o_version;
+		o->o_version--;
+	}
+
     if (soa_init_sdp_origin_with_session(ss, o, c0_buffer, local) < 0) {
       phrase = "Cannot Get IP Address for Session Description";
       goto internal_error;