diff --git a/pisi/metadata.py b/pisi/metadata.py
index 92931818..69954ca1 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -3,7 +3,7 @@ from ui import ui
 
 from xmlfile import *
 import specfile
-from specfile import SpecFile
+from specfile import *
 
 class MetaData(SpecFile):
     """This is a superset of the source spec definition"""
@@ -13,9 +13,23 @@ class MetaData(SpecFile):
     def read(self, filename):
         self.readxml(filename)
 
-        self.distribution = self.getNodeText("Distribution")
-        self.distributionRelease = self.getNodeText("DistributionRelease")
-        self.architecture = self.getNodeText("Architecture")
+	getNodeText = self.getNodeText
+
+	self.name = getNodeText("Name")
+	# self.summary # birden fazla olabilir (tr, en) SummaryInfo
+	               # icerisine almakta yarar var. SpecFile'da da
+	               # bu sekilde bir duzenleme gerekiyor.
+	self.homepage = getNodeText("Homepage")
+	self.license = getNodeText("License")
+	
+	historyElts = self.getAllNodes("History/Update")
+	self.history = [HistoryInfo(x) for x in historyElts]
+	self.version = self.history[0].version
+        self.release = self.history[0].release
+
+        self.distribution = getNodeText("Distribution")
+        self.distributionRelease = getNodeText("DistributionRelease")
+        self.architecture = getNodeText("Architecture")
         size = self.getNodeText("InstalledSize")
         if size:
             self.installedSize = int(size)
@@ -25,6 +39,4 @@ class MetaData(SpecFile):
         pass
 
     def verify():
-        if len(packages) != 1:
-            return False
         return True
diff --git a/tests/metadatatests.py b/tests/metadatatests.py
index ecd24ece..465ee8f2 100644
--- a/tests/metadatatests.py
+++ b/tests/metadatatests.py
@@ -10,8 +10,17 @@ class MetaDataTestCase(unittest.TestCase):
     def setUp(self):
         pass
         
-    def testReadWrite(self):
+    def testRead(self):
         md = metadata.MetaData()
         md.read('tests/sandbox/metadata.xml')
 
+	self.assertEqual(md.license, "As-Is")
+
+	self.assertEqual(md.version, "0.1")
+
+	self.assertEqual(md.installedSize, 40500)
+
+    def testWrite(self):
+	pass
+
 suite = unittest.makeSuite(MetaDataTestCase)
diff --git a/tests/sandbox/metadata.xml b/tests/sandbox/metadata.xml
index 9d769693..9be04510 100644
--- a/tests/sandbox/metadata.xml
+++ b/tests/sandbox/metadata.xml
@@ -5,14 +5,19 @@
   <Name>sandbox</Name>
   <Summary lang="tr">Bla</Summary>
   <Homepage>http://cekirdek.uludag.org.tr/~meren/</Homepage>
+  <License>As-Is</License>
+
+  <Distribution>Pardus</Distribution>
+  <DistributionRelease>0.1</DistributionRelease>
+  <Category>temprorary:zip</Category>
+  <Architecture>x86</Architecture>
+  <InstalledSize>40500</InstalledSize>
+
   <Packager>
     <Name>Meral</Name>
     <Email>meren@uludag.org.tr</Email>
   </Packager>
-  <License>As-Is</License>
-  <Archive archType="zip" sha1sum="b1e61fe4a840fbe624a01136e33343cdd1b0bf06">
-    http://cekirdek.uludag.org.tr/~meren/sandbox.zip
-  </Archive>
+
   <History>
     <Update>
       <Date>06/15/2005</Date>
@@ -20,9 +25,5 @@
       <Release>1</Release>
     </Update>
   </History>
-  <Distribution>Pardus</Distribution>
-  <DistributionRelease>0.1</DistributionRelease>
-  <Category>temprorary:zip</Category>
-  <Architecture>x86</Architecture>
-  <InstalledSize>40500</InstalledSize>
+
 </METADATA>