diff --git a/ChangeLog b/ChangeLog
index fcd7837d..a7e38722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-06-16 Fatih Aşıcı <fatih@pardus.org.tr>
+		* (operations/build.py): Fix resetting of the environment.
+
 2009-06-06 Ozan Çağlayan <ozan@pardus.org.tr>
 		* (operations/build.py): Sort the files according to their path names
 		before adding them to the tarfile. This helps lzma to compress the
diff --git a/pisi/operations/build.py b/pisi/operations/build.py
index dcaf58bc..8c935a73 100644
--- a/pisi/operations/build.py
+++ b/pisi/operations/build.py
@@ -1017,8 +1017,8 @@ class Builder:
         # buildfarm actually. buildfarm re-inits pisi for each build
         # and left environment variables go directly into initial dict
         # making actionsapi.variables.exportFlags() useless...
-        os.environ = {}
-        os.environ = copy.deepcopy(ctx.config.environ)
+        os.environ.clear()
+        os.environ.update(ctx.config.environ)
 
         return self.new_packages, self.old_packages