diff --git a/src/libbuild/autotools.py b/src/libbuild/autotools.py
index 73becc0e..150d40db 100644
--- a/src/libbuild/autotools.py
+++ b/src/libbuild/autotools.py
@@ -3,14 +3,16 @@
 
 import os, pisiconfig
 
-def configure():
-	os.system( './configure --prefix=/usr \
+def configure( parameters = None):
+	configure_string = './configure --prefix=/usr \
 				--host=i686-pc-linux-gnu \
 				--mandir=/usr/share/man \
 				--infodir=/usr/share/info \
 				--datadir=/usr/share \
 				--sysconfdir=/etc \
-				--localstatedir=/var/lib ')
+				--localstatedir=/var/lib {EXTRA}'
+
+	os.system( configure_string.replace( '{EXTRA}', parameters ))
 
 def make():
 	os.system( 'make' )
@@ -24,4 +26,4 @@ def install():
 				sysconfdir={D}/etc \
 				install'
 
-	os.system( install_string.replace('{D}', pisiconfig.image_dir ) )
+	os.system( install_string.replace( '{D}', os.path.dirname( os.getcwd() + '/image' ))
diff --git a/src/libbuild/gnuconfig.py b/src/libbuild/gnuconfig.py
index c6d965f3..32a61b3a 100644
--- a/src/libbuild/gnuconfig.py
+++ b/src/libbuild/gnuconfig.py
@@ -19,13 +19,13 @@ def gnuconfig_findnewest():
 
 	return os.path.dirname( newer_location.popitem()[0] )
 
-def gnuconfig_update():
+def gnuconfig_update( package_name ):
 
 	newer_location = gnuconfig_findnewest()
 	
 	try:
-		shutil.copyfile( newer_location + '/config.sub', pisiconfig.build_dir + 'popt-1.7' + '/config.sub' )
-		shutil.copyfile( newer_location + '/config.guess', pisiconfig.build_dir + 'popt-1.7' + '/config.guess' )
+		shutil.copyfile( newer_location + '/config.sub', pisiconfig.tmp_dir + package_name + '/build/config.sub' )
+		shutil.copyfile( newer_location + '/config.guess', pisiconfig.tmp_dir + package_name + '/build/config.guess' )
 	except IOError:
 		print 'Hata mata...'
 		sys.exit()
diff --git a/src/libbuild/libbuild.py b/src/libbuild/libbuild.py
index ca71743e..0a2de900 100644
--- a/src/libbuild/libbuild.py
+++ b/src/libbuild/libbuild.py
@@ -4,12 +4,17 @@
 from gnuconfig import *
 from libtoolize import *
 from autotools import *
+
+sys.path.append('..')
 import pisiconfig
 
 if __name__ == "__main__":
-	os.chdir( pisiconfig.build_dir + 'popt-1.7' )
-	gnuconfig_update()
+	package_name = 'popt-1.7'
+
+	os.chdir( pisiconfig.tmp_dir + package_name + '/build' )
+
+	gnuconfig_update( package_name )
 	libtoolize()
-	configure()
+	configure( '--with-nls' )
 	make()
 	install()
diff --git a/src/libbuild/libtoolize.py b/src/libbuild/libtoolize.py
index 877cf277..8f68e0f9 100644
--- a/src/libbuild/libtoolize.py
+++ b/src/libbuild/libtoolize.py
@@ -1,8 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-import os
+import os,sys
+
+sys.path.append('..')
+import pisiconfig
 
 def libtoolize():
-	os.system( 'patch -sN < /var/lib/pisi/portage-1.4.1.patch' )
-	os.system( 'patch -sN < /var/lib/pisi/sed-1.4.0.patch' )
+	os.system( 'patch -sN < ' + pisiconfig.lib_dir + '/portage-1.4.1.patch' )
+	os.system( 'patch -sN < ' + pisiconfig.lib_dir + '/sed-1.4.0.patch' )
diff --git a/src/pisiconfig.py b/src/pisiconfig.py
index 83c0c0ba..eb63255b 100644
--- a/src/pisiconfig.py
+++ b/src/pisiconfig.py
@@ -4,5 +4,3 @@ lib_dir = "/var/lib/pisi"
 db_dir = "/var/db/pisi"
 archives_dir = "/var/cache/pisi/archives"
 tmp_dir =  "/var/tmp/pisi"
-build_dir = tmp_dir + "/build"
-image_dir = tmp_dir + "/image"