diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 107b9fe59c..2ab9b1ea53 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,5 +1,7 @@
 2011-09-26  Sancho Lerena <slerena@artica.es>
 
+	* unix/HP-UX/pandora_agent.conf: Bad Disk module in HPUX
+
 	* unix/DEBIAN/control
 	unix/DEBIAN/make_deb_package.sh
 	unix/pandora_agent.spec
diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf
index 8c7f209179..a72ad4f37d 100755
--- a/pandora_agents/unix/HP-UX/pandora_agent.conf
+++ b/pandora_agents/unix/HP-UX/pandora_agent.conf
@@ -117,13 +117,18 @@ transfer_mode tentacle
 # System information
 # All this commands has been tested on a Standard HP-UX B.11.31
 
-module_begin 
-module_name disk_root_free
+module_begin
+module_name disk_usage_/
 module_type generic_data
-module_exec  bdf / | grep -v "Filesystem" | awk '{print $4}'
-module_max 100
-module_min 0
-module_description Free disk Percentage of root partition
+module_exec df -P | grep -e "/$" | awk '{print $5}' | tr -d %
+module_description  Disk usage on / (%)
+module_end
+
+module_begin
+module_name disk_usage_/var
+module_type generic_data
+module_exec df -P | grep -e "/var$" | awk '{print $5}' | tr -d %
+module_description  Disk usage on / var(%)
 module_end
 
 module_begin