diff --git a/bin/pisi b/bin/pisi
index 8449541d..f992e5f6 100755
--- a/bin/pisi
+++ b/bin/pisi
@@ -13,9 +13,6 @@ import pisi.install
 import pisi.util
 from pisi.build import PisiBuild, PisiBuildError
 
-class ArgError(Exception):
-    pass
-
 def main():
 
     # common options
diff --git a/bin/pisi-build b/bin/pisi-build
old mode 100644
new mode 100755
index f2d1c505..963fb51e
--- a/bin/pisi-build
+++ b/bin/pisi-build
@@ -4,36 +4,33 @@
 # python standard library
 from os.path import basename
 import sys
+from optparse import OptionParser
 
+# pisi modules
 sys.path.append("./lib")
 import pisi.context
 import pisi.util
 from pisi.build import PisiBuild, PisiBuildError
 
-def usage(progname = "pisi-build"):
-    print """
-Usage:
-%s [options] package-name.pspec
-""" %(progname)
-
 def main():
-    import sys
-    import getopt
+
+    # common options
     
-    # wrapper for usage(progname) function
-    help = lambda: usage(sys.argv[0])
+    usage = "usage: %prog [options] package-name.pspec"
+    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")
 
-    # getopt magic
-    try:
-        opts, args = getopt.getopt(sys.argv[1:],"h",["help"])
-    except getopt.GetoptError:
-        help()
-        sys.exit(1)
+    (options, args) = parser.parse_args()
 
-    for opt, arg in opts:
-        if opt == "-h":
-            help()
-            sys.exit(1)
+    print 'options = ', options
+    print 'args = ', args
 
     # pspec(PISI Spec) to be used for package
     pspec = ""
@@ -42,8 +39,9 @@ def main():
     # but pisi-build may build many packages (pspecs given in order)
     # sequentially.
     if len(args) != 1:
-        help()
-        raise PisiBuildError, "pisi-build expects one (and only one) pspec file currently"
+        print "pisi-build expects one (and only one) pspec file currently"
+        print usage
+        sys.exit(2)
     else:
         pspec = args[0]
 
@@ -53,7 +51,6 @@ def main():
     # don't do the real job here. this is just a CLI!
     pb = PisiBuild(ctx)
     pb.build()
-    
 
 if __name__ == "__main__":
     main()
diff --git a/bin/pisi-install b/bin/pisi-install
old mode 100644
new mode 100755