diff --git a/bin/pisi b/bin/pisi
index e50c6250..1391b7c0 100755
--- a/bin/pisi
+++ b/bin/pisi
@@ -9,6 +9,7 @@ from optparse import OptionParser
 sys.path.append("./lib")
 import pisi.install
 import pisi.util
+from pisi.build import PisiBuild, PisiBuildError
 
 class ArgError(Exception):
     pass
@@ -40,6 +41,35 @@ def main():
 
     cmd = args.pop(0)
 
+    if cmd=="build":
+
+        usage = "usage: %prog build <pspecfile>"
+        cparser = OptionParser(usage=usage,version="%prog " + pisi.__version__)
+        (coptions, cargs) = parser.parse_args(args)
+
+        print '*', cargs
+
+        # pspec(PISI Spec) to be used for package
+        pspec = ""
+
+        # TODO: We accept only one pspec file (at a time) currently,
+        # but pisi-build may build many packages (pspecs given in order)
+        # sequentially.
+        if len(cargs) != 1:
+            print "build expects one (and only one) pspec file currently"
+            print usage
+            sys.exit(2)
+        else:
+            pspec = cargs[0]
+
+        # What we need to do first is create a context with our specfile
+        ctx = pisi.context.Context(pspec)
+
+        # don't do the real job here. this is just a CLI!
+        pb = PisiBuild(ctx)
+        pb.build()
+        sys.exit(0)
+
     if cmd=="install":
 
         usage = "usage: %prog install <package>"
@@ -58,6 +88,11 @@ def main():
             package_fn = args[0]
 
         pisi.install.install_package_file(package_fn)
+        sys.exit(0)
+
+    print "command expected"
+    print usage
+    sys.exit(2)
 
 
 if __name__ == "__main__":
diff --git a/bin/pisi-build b/bin/pisi-build
index cc8cefa9..f2d1c505 100755
--- a/bin/pisi-build
+++ b/bin/pisi-build
@@ -3,10 +3,11 @@
 
 # python standard library
 from os.path import basename
+import sys
 
+sys.path.append("./lib")
 import pisi.context
 import pisi.util
-import pisi.ui
 from pisi.build import PisiBuild, PisiBuildError
 
 def usage(progname = "pisi-build"):
diff --git a/bin/pisi-install b/bin/pisi-install
index 278a161e..5cd24d89 100755
--- a/bin/pisi-install
+++ b/bin/pisi-install
@@ -5,6 +5,7 @@
 import sys
 from optparse import OptionParser
 
+sys.path.append("./lib")
 import pisi.install
 import pisi.util
 
diff --git a/lib/pisi/build.py b/lib/pisi/build.py
index db3a150e..dd559dc7 100644
--- a/lib/pisi/build.py
+++ b/lib/pisi/build.py
@@ -4,6 +4,7 @@
 
 # python standard library
 import os
+import sys
 
 from fetcher import Fetcher
 from archive import Archive