 -				c->text = text;
 +  if (col == NULL)
 +    {
-+      col = (Collection *)my_malloc(sizeof(Collection));
++      col = (Collection *)unrtf_malloc(sizeof(Collection));
 +      col->nr = nr;
 +      col->text = strdup(text);
 +      col->next = NULL;

+#endif /* _MY_ICONV */
diff -durpN unrtf-0.21.2.old/src/output.c unrtf-0.21.2/src/output.c
--- unrtf-0.21.2.old/src/output.c	2011-06-07 08:04:38.000000000 -0400
+++ unrtf-0.21.2/src/output.c	2012-03-13 16:38:41.327940973 -0400
@@ -1,23 +1,23 @@
 /*=============================================================================
-   GNU UnRTF, a command-line program to convert RTF documents to other formats.

+#define USAGE "unrtf [--version] [--verbose] [--help] [--nopict|-n] [--noremap] [--html] [--text] [--vt] [--latex] [--rtf] [-P config_search_path]  [-t <file_with_tags>)] <filename>"
diff -durpN unrtf-0.21.2.old/src/Makefile.am unrtf-0.21.2/src/Makefile.am
--- unrtf-0.21.2.old/src/Makefile.am	2010-07-03 22:30:58.000000000 -0400
+++ unrtf-0.21.2/src/Makefile.am	2012-08-21 13:33:44.821682709 -0400
@@ -13,7 +13,6 @@ unrtf_SOURCES = attr.c attr.h         \
 		malloc.c malloc.h     \
 		output.c output.h     \
