diff --git a/CHANGES b/CHANGES
index 0327789c8f5946962a82c884e19652d2f3dc74f2..132d31ef30997807a07d84dc4a5da93b9081d5d8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -133,6 +133,9 @@ Applications
    during the Dial will be set to the argument passed to the 'f' option.
  * Dial now inherits the GOSUB_RETVAL from the peer, when the U() option runs a
    Gosub on the peer.
+ * The OSP lookup application adds in/outbound network ID, optional security,
+   number portability, QoS reporting, destination IP port, custom info and service
+   type features.
 
 Dialplan Functions
 ------------------
diff --git a/UPGRADE.txt b/UPGRADE.txt
index f402c81bec1222e9649ee94c8bd33bb785876518..0aff1da4aca8bf21c785adf60c2256f9104b2023 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -67,6 +67,14 @@ From 1.6.2 to 1.8:
   working that will no longer work.
   Please see doc/externalivr.txt for details.
 
+* OSP lookup application changes following variable names:
+  OSPPEERIP to OSPINPEERIP
+  OSPTECH to OSPOUTTECH
+  OSPDEST to OSPDESTINATION
+  OSPCALLING to OSPOUTCALLING
+  OSPCALLED to OSPOUTCALLED
+  OSPRESULTS to OSPDESTREMAILS
+
 From 1.6.1 to 1.6.2:
 
 * SIP no longer sends the 183 progress message for early media by
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 509f927fe9d8d7696d329f29c487153c7ed44013..c116a0d76b4830ab2eeeaeae0185395d0a971798 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -222,6 +222,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 				<variable name="OSPOUTCALLIDTYPES">
 					<para>The outbound Call-ID types.</para>
 				</variable>
+				<variable name="OSPOUTCALLID">
+					<para>The outbound Call-ID. Only for H.323.</para>
+				</variable>
 				<variable name="OSPDIALSTR">
 					<para>The outbound Dial command string.</para>
 				</variable>
@@ -908,7 +911,7 @@ static int osp_get_provider(
  * \param name OSP provider context name
  * \param trans OSP transaction handle, output
  * \param source Source of provider, output
- * \param sourcesize Size of source buffer, in
+ * \param srcsize Size of source buffer, in
  * \return OSK_OK Success, OSK_FAILED Failed, OSP_ERROR Error
  */
 static int osp_create_transaction(
@@ -2910,7 +2913,6 @@ static int osp_load(int reload)
 			osp_security = 1;
 		}
 		ast_debug(1, "OSP: osp_security '%d'\n", osp_security);
-
 		
 		if ((cvar = ast_variable_retrieve(cfg, OSP_GENERAL_CAT, "tokenformat"))) {
 			if ((sscanf(cvar, "%30d", &ivar) == 1) &&