diff --git a/libs/spandsp/src/gsm0610_local.h b/libs/spandsp/src/gsm0610_local.h
index dadbc23774..4809815d22 100644
--- a/libs/spandsp/src/gsm0610_local.h
+++ b/libs/spandsp/src/gsm0610_local.h
@@ -25,7 +25,7 @@
  * This code is based on the widely used GSM 06.10 code available from
  * http://kbs.cs.tu-berlin.de/~jutta/toast.html
  *
- * $Id: gsm0610_local.h,v 1.13 2009/01/16 15:49:59 steveu Exp $
+ * $Id: gsm0610_local.h,v 1.14 2009/03/07 16:47:30 steveu Exp $
  */
 
 #if !defined(_GSM0610_LOCAL_H_)
@@ -216,8 +216,6 @@ extern int16_t gsm0610_norm(int32_t a);
 
 #if defined(__GNUC__)  &&  defined(__i386__)
 
-void gsm0610_vec_vsraw(const int16_t *p, int n, int bits);
-
 int32_t gsm0610_vec_iprod(const int16_t *p, const int16_t *q, int n);
 
 int32_t gsm0610_vec_maxmin(const int16_t *p, int n, int16_t *out);
diff --git a/libs/spandsp/src/spandsp/adsi.h b/libs/spandsp/src/spandsp/adsi.h
index a725f7b5a2..00c6b7d31b 100644
--- a/libs/spandsp/src/spandsp/adsi.h
+++ b/libs/spandsp/src/spandsp/adsi.h
@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: adsi.h,v 1.36 2009/02/10 13:06:47 steveu Exp $
+ * $Id: adsi.h,v 1.37 2009/03/04 12:15:15 steveu Exp $
  */
 
 /*! \file */
@@ -249,7 +249,7 @@ enum
 /*! Message waiting/not waiting */
 #define MCLASS_VISUAL_INDICATOR         0x0B
 
-/*! Definitions for CLIP (Calling Line Identity Presentation) */
+/*! Definitions for CLIP (Calling Line Identity Presentation) (from ETS 300 659-1) */
 enum
 {
     /*! Multiple data message caller ID */
@@ -262,31 +262,37 @@ enum
     CLIP_MDMF_SMS =                     0x89
 };
 
-/*! CLIP message IDs */
+/*! CLIP message IDs (from ETS 300 659-1) */
 enum
 {
     /*! Date and time (MMDDHHMM) */
     CLIP_DATETIME =                     0x01,
-    /*! Caller number */
+    /*! Caller number (AKA calling line identity) */
     CLIP_CALLER_NUMBER =                0x02,
-    /*! Dialed number */
+    /*! Dialed number (AKA called line identity) */
     CLIP_DIALED_NUMBER =                0x03,
-    /*! Caller number absent: 'O' or 'P' */
+    /*! Caller number absent: 'O' or 'P' (AKA reason for absence of calling line identity) */
     CLIP_ABSENCE1 =                     0x04,
-    /*! Caller's name */
+    /*! Caller's name (AKA calling party name) */
     CLIP_CALLER_NAME =                  0x07,
-    /*! Caller's name absent: 'O' or 'P' */
+    /*! Caller's name absent: 'O' or 'P' (AKA reason for absence of calling party name) */
     CLIP_ABSENCE2 =                     0x08,
     /*! Visual indicator */
     CLIP_VISUAL_INDICATOR =             0x0B,
     /*! Message ID */
     CLIP_MESSAGE_ID =                   0x0D,
-    /*! Voice call, ring-back-when-free call, or msg waiting call */
+    /*! Complementary calling line identity */
+    CLIP_COMPLEMENTARY_CALLER_NUMBER =  0x10,
+    /*! Call type - voice call (1), ring-back-when-free call (2), calling name delivery (3) or msg waiting call(0x81) */
     CLIP_CALLTYPE =                     0x11,
     /*! Number of messages */
     CLIP_NUM_MSG =                      0x13,
+    /*! Type of forwarded call */
+    CLIP_TYPE_OF_FORWARDED_CALL =       0x15,
+    /*! Type of calling user */
+    CLIP_TYPE_OF_CALLING_USER =         0x16,
     /*! Redirecting number */
-    CLIP_REDIR_NUMBER =                 0x03,
+    CLIP_REDIR_NUMBER =                 0x1A,
     /*! Charge */
     CLIP_CHARGE =                       0x20,
     /*! Duration of the call */
diff --git a/libs/spandsp/src/spandsp/version.h b/libs/spandsp/src/spandsp/version.h
index 213ee66d6c..19348eafd2 100644
--- a/libs/spandsp/src/spandsp/version.h
+++ b/libs/spandsp/src/spandsp/version.h
@@ -30,9 +30,9 @@
 
 /* The date and time of the version are in UTC form. */
 
-#define SPANDSP_RELEASE_DATE            20090301
-#define SPANDSP_RELEASE_TIME            125126
-#define SPANDSP_RELEASE_DATETIME_STRING "20090301 125126"
+#define SPANDSP_RELEASE_DATE            20090307
+#define SPANDSP_RELEASE_TIME            165620
+#define SPANDSP_RELEASE_DATETIME_STRING "20090307 165620"
 
 #endif
 /*- End of file ------------------------------------------------------------*/