diff --git a/src/pisi/build.py b/src/pisi/build.py
index ac3bdca8..49d67c10 100644
--- a/src/pisi/build.py
+++ b/src/pisi/build.py
@@ -49,10 +49,11 @@ class PisiBuild:
 	self.applyPatches()
 
 	try:
-		self.actionScript = open(os.path.dirname(self.ctx.pspecfile ) + '/' + 'actions').read()
+	    specdir = os.path.dirname(self.ctx.pspecfile)
+	    self.actionScript = open("/".join([specdir,self.ctx.const.actions_file])).read()
 	except IOError, e:
-		ui.error ("Action Script: %s\n" % e)
-		return 
+	    ui.error ("Action Script: %s\n" % e)
+	    return 
 		
 	# FIXME: It's wrong to assume that unpacked archive 
 	# will create a name-version top-level directory.
@@ -62,10 +63,10 @@ class PisiBuild:
 	locals = globals = {}
 	
 	try:
-		exec compile(self.actionScript , "error", "exec") in locals,globals
+	    exec compile(self.actionScript , "error", "exec") in locals,globals
 	except SyntaxError, e:
-		ui.error ("Error : %s\n" % e)
-		return 
+	    ui.error ("Error : %s\n" % e)
+	    return 
 		
 	self.configureSource(locals)
 	self.buildSource(locals)
@@ -107,18 +108,18 @@ class PisiBuild:
 
     def configureSource(self, locals):
 	if 'src_setup' in locals:
-		ui.info("Configuring %s...\n" % self.spec.source.name)
-		locals['src_setup']()
+	    ui.info("Configuring %s...\n" % self.spec.source.name)
+	    locals['src_setup']()
 
     def buildSource(self, locals):
 	if 'src_build' in locals:
-		ui.info("Building %s...\n" % self.spec.source.name)
-		locals['src_build']()
+	    ui.info("Building %s...\n" % self.spec.source.name)
+	    locals['src_build']()
 
     def installSource(self, locals):
 	if 'src_install' in locals:
-		ui.info("Installing %s...\n" % self.spec.source.name)
-		locals['src_install']()
+	    ui.info("Installing %s...\n" % self.spec.source.name)
+	    locals['src_install']()
 
     def buildPackages(self):
         for package in self.spec.packages:
diff --git a/src/pisi/context.py b/src/pisi/context.py
index 952ba66a..ab2e99ce 100644
--- a/src/pisi/context.py
+++ b/src/pisi/context.py
@@ -34,6 +34,10 @@ class Constants:
 	self.c.build_work_dir_suffix = "/work"
 	self.c.build_install_dir_suffix  = "/install"
 
+	# file/directory names
+	self.c.actions_file = "actions.py"
+	self.c.files_dir = "files"
+
     def __getattr__(self, attr):
  	return getattr(self.c, attr)
 
diff --git a/src/samples/popt/actions b/src/samples/popt/actions.py
similarity index 100%
rename from src/samples/popt/actions
rename to src/samples/popt/actions.py