--- app_iconv-0.9.2/app_iconv.c.orig	2005-11-27 11:03:40.000000000 +0000
+++ app_iconv-0.9.2/app_iconv.c	2006-04-15 22:22:23.000000000 +0000
@@ -82,12 +82,9 @@
   strconvert(convert_from, convert_to, string, result);
 
   if(strcmp("CALLERIDNAME", varname)==0) {
-    char *cidnum, *cidname, newcid[256] = "";
-    ast_callerid_parse(chan->callerid, &cidname, &cidnum);
-    snprintf(newcid, sizeof(newcid), "\"%s\" <%s>", result, cidnum);		
     if(option_verbose > 2)
-      ast_verbose (VERBOSE_PREFIX_3 "Iconv: set CID to %s\n", newcid);
-    ast_set_callerid (chan, newcid, 0);
+      ast_verbose (VERBOSE_PREFIX_3 "Iconv: set CIDNAME to %s\n", result);
+    ast_set_callerid (chan, NULL, result, NULL);
   } else {
     pbx_builtin_setvar_helper(chan, varname, result);
   }