diff --git a/ChangeLog b/ChangeLog
index ddbfb5e5..dade445a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-15 Faik Uygur <faik@pardus.org.tr>
+		* pisi/component.py (Component): Make LocalName, Summary and
+		Description optional for cleaning up component.xml files in the
+		repository.
+
 2009-12-14 Serdar Dalgıç <serdar@pardus.org.tr>
 		*	Add architecture and distribution release check to pisi add-repo
 		New parameter --ignore-check is added to pisi ar too.
diff --git a/pisi/component.py b/pisi/component.py
index 4f940742..78aff637 100644
--- a/pisi/component.py
+++ b/pisi/component.py
@@ -64,8 +64,8 @@ class Component(xmlfile.XmlFile):
     t_LocalName = [autoxml.LocalText, autoxml.optional]
 
     # Information about the component
-    t_Summary = [autoxml.LocalText, autoxml.mandatory]
-    t_Description = [autoxml.LocalText, autoxml.mandatory]
+    t_Summary = [autoxml.LocalText, autoxml.optional]
+    t_Description = [autoxml.LocalText, autoxml.optional]
     t_Group = [ autoxml.String, autoxml.optional ]
 
     # the parts of this component.