diff --git a/pisi-build b/pisi-build
index 41bb0f93..2f182f23 100755
--- a/pisi-build
+++ b/pisi-build
@@ -15,17 +15,11 @@ from pisi.build import PisiBuild, PisiBuildError
 def main():
 
     # common options
-    
+
     usage = "usage: %prog [options] package-name.pspec"
+    import pisi.commonargs
     parser = OptionParser(usage=usage,version="%prog " + pisi.__version__)
-    parser.add_option("-D", "--destdir", action="store")
-    parser.add_option("-v", "--verbose", action="store_true",
-                      dest="verbose", default=False,
-                      help="detailed output")
-    parser.add_option("-d", "--debug", action="store_true", default=True)
-    parser.add_option("-n", "--dry-run", action="store_true", default=False,
-                      help = "do not perform any action, just show what\
-                      would be done")
+    pisi.commonargs.add(parser)
 
     (options, args) = parser.parse_args()
 
diff --git a/pisi/commonargs.py b/pisi/commonargs.py
new file mode 100644
index 00000000..52883881
--- /dev/null
+++ b/pisi/commonargs.py
@@ -0,0 +1,14 @@
+from optparse import OptionParser
+
+def add(parser):
+
+    parser.add_option("-D", "--destdir", action="store")
+    parser.add_option("-v", "--verbose", action="store_true",
+                      dest="verbose", default=False,
+                      help="detailed output")
+    parser.add_option("-d", "--debug", action="store_true", default=True)
+    parser.add_option("-n", "--dry-run", action="store_true", default=False,
+                      help = "do not perform any action, just show what\
+                      would be done")
+    return parser
+
diff --git a/pisi/specfile.py b/pisi/specfile.py
index ddb14d6b..1df48f82 100644
--- a/pisi/specfile.py
+++ b/pisi/specfile.py
@@ -96,7 +96,7 @@ class SourceInfo:
         archiveNode = getNode(node, "Archive")
         self.archiveUri = getNodeText(archiveNode).strip()
         self.archiveName = basename(self.archiveUri)
-        self.archiveType = getNodeAttribute(archiveNode, "archType")
+        self.archiveType = getNodeAttribute(archiveNode, "type")
         self.archiveSHA1 = getNodeAttribute(archiveNode, "sha1sum")
         patchElts = getAllNodes(node, "Patches/Patch")
         self.patches = [PatchInfo(p) for p in patchElts]
@@ -116,7 +116,7 @@ class SourceInfo:
         xml.addTextNodeUnder(node, "IsA", self.isa)
         xml.addTextNodeUnder(node, "PartOf", self.partof)
         archiveNode = xml.addNodeUnder(node, "Archive")
-        archiveNode.setAttribute("archType", self.archiveType)
+        archiveNode.setAttribute("type", self.archiveType)
         archiveNode.setAttribute("sha1sum", self.archiveSHA1)
         for patch in self.patches:
             xml.addNodeUnder(node, "Patches", patch.elt(xml))
diff --git a/samples/amarok/amarok-1.3-beta1.pspec b/samples/amarok/amarok-1.3-beta1.pspec
index 45a7e58f..f2897e5f 100644
--- a/samples/amarok/amarok-1.3-beta1.pspec
+++ b/samples/amarok/amarok-1.3-beta1.pspec
@@ -16,7 +16,7 @@
     <PartOf>desktop:kde</PartOf>
     <Summary>Amarok audio player</Summary>
     <Description>Feature-rich audio player for KDE system.</Description>
-    <Archive archType="tarbz2" sha1sum="660b576bcf5df6644dde03ba88d604c52191d593">
+    <Archive type="tarbz2" sha1sum="660b576bcf5df6644dde03ba88d604c52191d593">
       http://umn.dl.sourceforge.net/sourceforge/amarok/amarok-1.3-beta1.tar.bz2
     </Archive>
     <BuildDependencies>
diff --git a/samples/logrotate/logrotate.pspec b/samples/logrotate/logrotate.pspec
index 41904dc0..89768fe5 100644
--- a/samples/logrotate/logrotate.pspec
+++ b/samples/logrotate/logrotate.pspec
@@ -14,7 +14,10 @@
         <IsA>ISA</IsA>
         <PartOf>PARTOF</PartOf>
         <Description>Rotates, compresses, and mails system logs</Description>
-        <Archive archType="targz" sha1sum="84ce324a78ee071536c39e95d3086e53d7fe7ccb">ftp://ftp.linux.org.tr/pub/mirrors/gentoo/distfiles/logrotate_3.6.5.orig.tar.gz</Archive>
+        <Archive type="targz"
+	sha1sum="84ce324a78ee071536c39e95d3086e53d7fe7ccb">
+	  ftp://ftp.linux.org.tr/pub/mirrors/gentoo/distfiles/logrotate_3.6.5.orig.tar.gz
+	</Archive>
         <BuildDependencies>
 
        <Dependency>>=sys-apps/portage-2.0.47-r10</Dependency>
diff --git a/samples/popt/popt.pspec b/samples/popt/popt.pspec
index e540dd2f..a7d22a29 100644
--- a/samples/popt/popt.pspec
+++ b/samples/popt/popt.pspec
@@ -25,7 +25,7 @@
 	4) popt provides convience functions for parsing strings
 	   into argv[] style arrays
     </Description>
-    <Archive archType="targz" sha1sum="66f3c77b87a160951b180447f4a6dce68ad2f71b">
+    <Archive type="targz" sha1sum="66f3c77b87a160951b180447f4a6dce68ad2f71b">
       ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-1.7.tar.gz
     </Archive>
     <Patches>
diff --git a/samples/startup-notification/startup-notification.pspec b/samples/startup-notification/startup-notification.pspec
index f55fb969..1df115b5 100644
--- a/samples/startup-notification/startup-notification.pspec
+++ b/samples/startup-notification/startup-notification.pspec
@@ -18,8 +18,8 @@
     <PartOf>rpm:archive</PartOf>
     <Description>Application startup notification and feedback library
     </Description>
-    <Archive archType="tarbz2" sha1sum="d2b5698b6209b5172d17222a3117db6447d7cdf1">
-        ftp://ftp.linux.org.tr/pub/mirrors/gentoo/distfiles/startup-notification-0.8.tar.bz2
+    <Archive type="tarbz2" sha1sum="d2b5698b6209b5172d17222a3117db6447d7cdf1">
+    ftp://ftp.linux.org.tr/pub/mirrors/gentoo/distfiles/startup-notification-0.8.tar.bz2
     </Archive>
     <BuildDependencies>
       <Dependency versionFrom="1.8"> make </Dependency>