diff --git a/extras/ChangeLog b/extras/ChangeLog
index d9cd6356c1..c47067e7e4 100644
--- a/extras/ChangeLog
+++ b/extras/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-22  Ramon Novoa  <rnovoa@artica.es>
+
+	* build_src.sh: Updated to work with the current directory structure.
+
 2010-12-28  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandora_update_version.sh: Update the console installer version. Fixed
diff --git a/extras/build_src.sh b/extras/build_src.sh
index e6e6e5d47c..a14803006b 100755
--- a/extras/build_src.sh
+++ b/extras/build_src.sh
@@ -17,8 +17,11 @@ cd $CODEHOME && tar zcvf $RPMHOME/SOURCES/pandorafms_console-$VERSION.tar.gz --e
 # Server
 cd $CODEHOME && tar zcvf $RPMHOME/SOURCES/pandorafms_server-$VERSION.tar.gz --exclude \.svn pandora_server || exit 1
 
-# Linux and Unix agents
-cd $CODEHOME/pandora_agents && tar zcvf $RPMHOME/SOURCES/pandorafms_agent-$VERSION.tar.gz --exclude \.svn --exclude nohup linux && tar zvcf $RPMHOME/SOURCES/pandorafms_agent_unix-$VERSION.tar.gz --exclude \.svn --exclude nohup --exclude NT4 unix || exit 1
+# Linux agent
+cd $CODEHOME/pandora_agents/shellscript && tar zcvf $RPMHOME/SOURCES/pandorafms_agent-$VERSION.tar.gz --exclude \.svn --exclude nohup linux || exit 1
+
+# Unix agent
+cd $CODEHOME/pandora_agents && tar zvcf $RPMHOME/SOURCES/pandorafms_agent_unix-$VERSION.tar.gz --exclude \.svn --exclude nohup --exclude NT4 unix || exit 1
 
 # Enterprise console
 cd $CODEHOME_ENT/pandora/trunk/pandora_console && tar zcvf $RPMHOME/SOURCES/pandorafms_console_enterprise-$VERSION.tar.gz --exclude \.svn enterprise/* || exit 1