diff --git a/pisi/index.py b/pisi/index.py
index bf81c72a..8d700d6f 100644
--- a/pisi/index.py
+++ b/pisi/index.py
@@ -48,6 +48,7 @@ class Index(XmlFile):
     t_Distribution = [ component.Distribution, autoxml.optional ]
     t_Specs = [ [specfile.SpecFile], autoxml.optional, "SpecFile"]
     t_Packages = [ [metadata.Package], autoxml.optional, "Package"]
+    #t_Metadatas = [ [metadata.MetaData], autoxml.optional, "MetaData"]
     t_Components = [ [component.Component], autoxml.optional, "Component"]
 
     def name():
@@ -63,9 +64,9 @@ class Index(XmlFile):
             pisi.util.clean_dir(tmpdir)
         pisi.util.check_dir(tmpdir)
 
-	if not force:
-	    urlfile = file(pisi.util.join_path(tmpdir, 'uri'), 'w')
-	    urlfile.write(filename) # uri
+        if not force:
+            urlfile = file(pisi.util.join_path(tmpdir, 'uri'), 'w')
+            urlfile.write(filename) # uri
 
 
         # FIXME: This is a mess, we have a compress flag and we have to
diff --git a/pisi/metadata.py b/pisi/metadata.py
index 1727180d..d54643b0 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -50,6 +50,8 @@ class Package(specfile.Package):
     t_PackageSize = [ autoxml.Long, autoxml.optional]
     t_PackageURI = [ autoxml.String, autoxml.optional]
 
+    t_Source = [ Source, autoxml.optional]
+    
     def decode_hook(self, node, errs, where):
         self.version = self.history[0].version
         self.release = self.history[0].release
@@ -79,6 +81,7 @@ class MetaData(xmlfile.XmlFile):
         self.source.name = src.name
         self.source.homepage = src.homepage
         self.source.packager = src.packager
+        self.package.source = self.source # FIXME: I know that replication sucks here, but this is the easiest for now-- exa
         self.package.name = pkg.name
         self.package.summary = pkg.summary
         self.package.description = pkg.description