diff --git a/pisi/build.py b/pisi/build.py
index 120b29c4..5a2de967 100644
--- a/pisi/build.py
+++ b/pisi/build.py
@@ -96,33 +96,37 @@ class PisiBuild:
             locals[func]()
         
     def genMetaDataXml(self, package):
-        #test
         metadata = MetaData()
 
-        createElement = metadata.dom.createElement
-        createTextNode = metadata.dom.createTextNode
-
-        elt = createElement("Distribution")
-        elt.appendChild(createTextNode(self.ctx.const.distribution))
-        metadata.appendElement(elt)
-
-        elt = createElement("DistrubutionRelease")
-        elt.appendChild(createTextNode(self.ctx.const.distributionRelease))
-        metadata.appendElement(elt)
-
-        elt = createElement("Architecture")
-        elt.appendChild(createTextNode("Any")) # FIXME
-        metadata.appendElement(elt)
+        def createElt(tagName, text):
+            createElement = metadata.dom.createElement
+            createTextNode = metadata.dom.createTextNode
+            elt = createElement(tagName)
+            elt.appendChild(createTextNode(text))
+            return elt
 
+        metadata.appendElement(createElt("Name",
+                                         package.name))
+        metadata.appendElement(createElt("Summary",
+                                         package.summary))
+        metadata.appendElement(createElt("Description",
+                                         package.description))
+        metadata.appendElement(createElt("License",
+                                         self.spec.source.license))
+        metadata.appendElement(createElt("Distribution",
+                                         self.ctx.const.distribution))
+        metadata.appendElement(createElt("DistributionRelease",
+                                         self.ctx.const.distributionRelease))
+        metadata.appendElement(createElt("Architecture",
+                                         "Any")) # FIXME
         # FIXME: Bu hatalı. installsize'ı almak için tüm
         # pkg_install_dir()'ın boyutunu hesaplayamayız. Bir source
         # birden fazla kaynak üretebilir. package.paths ile
         # karşılaştırarak file listesinden boyutları hesaplatmalıyız.
         d = self.ctx.pkg_install_dir()
         size = util.dir_size(d)
-        elt = createElement("InstalledSize")
-        elt.appendChild(createTextNode(str(size)))
-        metadata.appendElement(elt)
+        metadata.appendElement(createElt("InstalledSize",
+                                         str(size)))
 
 
         metadata.write(os.path.join(self.ctx.pkg_dir(),"metadata.xml"))
diff --git a/pisi/specfile.py b/pisi/specfile.py
index 14a01c9f..850fdc39 100644
--- a/pisi/specfile.py
+++ b/pisi/specfile.py
@@ -60,6 +60,7 @@ class SpecFile(XmlFile):
 
         self.source = SourceInfo()
         self.source.name = self.getChildText("Source/Name")
+        self.source.license = self.getChildText("Source/License")
         self.source.workdir = self.getChildText("Source/WorkDir")
         archiveNode = self.getNode("Source/Archive")
         self.source.archiveUri = getNodeText(archiveNode).strip()