diff --git a/filter/ChangeLog b/filter/ChangeLog
index 12a273be3d..dd6cabef31 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-21  Jeffrey Stedfast  <fejj@novell.com>
+
+	* filter-input.c (xml_encode): encode entities. fixes bug #46677.
+
 2004-06-18  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* filter-errors.xml.h: Re-added - THIS IS NOT TO BE REMOVED!!!!
diff --git a/filter/filter-input.c b/filter/filter-input.c
index 021aa54a28..e83da431fe 100644
--- a/filter/filter-input.c
+++ b/filter/filter-input.c
@@ -252,7 +252,11 @@ xml_encode (FilterElement *fe)
 		char *str = l->data;
 		
                 cur = xmlNewChild (value, NULL, type, NULL);
+		
+		str = xmlEncodeEntitiesReentrant (NULL, str);
 		xmlNodeSetContent (cur, str);
+		xmlFree (str);
+		
 		l = l->next;
 	}