diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index 6b912f6..532e407 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -128,6 +128,9 @@
 typedef struct {
     int messageRef;   /*TP-Message-Reference*/
     char *ackPDU;     /* or NULL if n/a */
+    int errorCode;    /* See 3GPP 27.005, 3.2.5 for GSM/UMTS,
+                         3GPP2 N.S0005 (IS-41C) Table 171 for CDMA,
+                         -1 if unknown or not applicable*/
 } RIL_SMS_Response;
 
 /** Used by RIL_REQUEST_WRITE_SMS_TO_SIM */
@@ -1213,6 +1216,11 @@
  *                          override the one in the profile. NULL indicates no APN overrride.
  * ((const char **)data)[3] is the username for APN, or NULL
  * ((const char **)data)[4] is the password for APN, or NULL
+ * ((const char **)data)[5] is the PAP / CHAP auth type. Values:
+ *                          0 => PAP and CHAP is never performed.
+ *                          1 => PAP may be performed; CHAP is never performed.
+ *                          2 => CHAP may be performed; PAP is never performed.
+ *                          3 => PAP / CHAP may be performed - baseband dependent.
  *
  * "response" is a char **
  * ((char **)response)[0] indicating PDP CID, which is generated by RIL. This Connection ID is
diff --git a/libril/ril.cpp b/libril/ril.cpp
index fae17ca..dc69b14 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -1365,10 +1365,11 @@
 
     p.writeInt32(p_cur->messageRef);
     writeStringToParcel(p, p_cur->ackPDU);
+    p.writeInt32(p_cur->errorCode);
 
     startResponse;
-    appendPrintBuf("%s%d,%s", printBuf, p_cur->messageRef,
-        (char*)p_cur->ackPDU);
+    appendPrintBuf("%s%d,%s,%d", printBuf, p_cur->messageRef,
+        (char*)p_cur->ackPDU, p_cur->errorCode);
     closeResponse;
 
     return 0;