diff --git a/pisi/build.py b/pisi/build.py
index ebef3312..a52d3c6b 100644
--- a/pisi/build.py
+++ b/pisi/build.py
@@ -14,6 +14,7 @@ from sourcearchive import SourceArchive
 from files import Files, FileInfo
 from specfile import SpecFile
 from metadata import MetaData
+from package import Package
 
 class PisiBuildError(Exception):
     pass
@@ -214,3 +215,13 @@ class PisiBuild:
             ui.info(" done.\n")
 
             ui.info("Creating PISI package bla bla....\n")
+            # testing
+            pkgName = package.name + "-" + self.spec.source.version + ".pisi"
+            pkg = Package(pkgName, 'w')
+            c = os.getcwd()
+
+            os.chdir(self.ctx.pkg_dir())
+            pkg.add_file("files.xml")
+            pkg.add_file("metadata.xml")
+            pkg.close()
+            os.chdir(c)
diff --git a/pisi/package.py b/pisi/package.py
index e2338bbf..1328f8e5 100644
--- a/pisi/package.py
+++ b/pisi/package.py
@@ -6,12 +6,16 @@ import archive
 
 class Package:
     """Package: PISI package class"""
-    def __init__(self, packagefn):
-        self.impl = archive.ArchiveZip(packagefn)
+    def __init__(self, packagefn, mode='r'):
+        self.impl = archive.ArchiveZip(packagefn, 'zip', mode)
         self.filename = packagefn
 
     def add_file(self, fn):
         """add a file to package"""
+        self.impl.add_file(self.filename, fn)
+
+    def close(self):
+        self.impl.close()
 
     def extract(self, outdir):
         """extract entire package contents to directory"""