diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf
index 2709d73274..eab7d88d95 100644
--- a/pandora_agents/unix/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf
@@ -1,7 +1,7 @@
 # Base config file for Pandora FMS agents
 # Version 5.1SP4, FreeBSD Version
 # Licensed under GPL license v2,
-# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
+# Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
 
 # General Parameters
@@ -21,6 +21,18 @@ interval    	300
 # and does not copy XML to server.
 debug 		0	
 
+# Optional. UDP Server to receive orders from outside
+# By default is disabled, set 1 to enable
+# Set port (41122 by default)
+# Set address to restrict who can order a agent restart (0.0.0.0 = anybody)
+#
+udp_server 0
+udp_server_port 41122
+udp_server_auth_address 0.0.0.0
+
+#process_xeyes_start xeyes
+#process_xeyes_stop killall xeyes
+
 # By default, agent takes machine name
 #agent_name     adama
 
@@ -48,6 +60,13 @@ group Servers
 # Agent position paramters
 # Those parameters define the geographical position of the agent 
 
+# gis_exec: Call a script that returns a string with a fixed
+# format of latitude,longitude,altitude
+# i.e.: 41.377,-5.105,2.365
+
+#gis_exec /tmp/gis.sh
+
+# This sets the GIS coordinates as fixed values:
 # latitude 
 #latitude 0
 # longitude
@@ -55,11 +74,11 @@ group Servers
 # altitude
 #altitude 0
 
-#Position description
+#GPS Position description
 #position_description Madrid, centro
 
 # By default agent try to take default encoding defined in host.
-# encoding 	UTF-8
+#encoding 	UTF-8
 
 # Listening TCP port for remote server. By default is 41121 (for tentacle)
 # if you want to use SSH use 22, and FTP uses 21.
@@ -69,30 +88,30 @@ server_port	41121
 transfer_mode tentacle
 
 # Server password (Tentacle or FTP). Leave empty for no password (default).
-# server_pwd mypassword
+#server_pwd mypassword
 
 # Set to yes/no to enable/disable OpenSSL support for Tentacle (disabled by default).
-# server_ssl no
+#server_ssl no
 
 # Extra options for the Tentacle client (for example: server_opts -v -r 5).
-# server_opts
+#server_opts
 
 # delayed_startup defines number of seconds before start execution
 # for first time when startup Pandora FMS Agent
-# delayed_startup 10
+#delayed_startup 10
 
 # Pandora nice defines priority of execution. Less priority means more intensive execution
 # A recommended value is 10. 0 priority means no Pandora CPU protection enabled (default)
-# pandora_nice 0
+#pandora_nice 0
 
 # Cron mode replace Pandora FMS own task schedule each XX interval seconds by the use
 # of old style cron. You should add to crontab Pandora FMS agent script to use this mode.
 # This is disabled by default, and is not recommended.  Use Pandora FMS internal scheduler
 # is much more safe.
-# cron_mode 
+#cron_mode 
 
 # If set to 1 allows the agent to be configured via the web console (Only Enterprise version) 
-# remote_config 1
+remote_config 0
 
 # If set to 1 start Drone Agent's Proxy Mode
 # proxy_mode 1
@@ -107,7 +126,15 @@ transfer_mode tentacle
 #agent_threads 1
 
 # User the agent will run as
-#pandora_user root
+#pandora_user pandora
+
+# Enable or disable XML buffer.
+# If you are in a secured environment and want to enable the XML buffer you
+# should consider changing the temporal directory, since /tmp is world writable.
+xml_buffer 1
+
+# Minimum available bytes in the temporal directory to enable the XML buffer
+temporal_min_size 1024
 
 # Secondary server configuration
 # ==============================
@@ -205,7 +232,10 @@ module_type async_string
 module_exec last | head -1
 module_end
 
-# Plugin example
+
+# This plugin detects all disk and report free space (%)
+
+module_plugin pandora_df_free
 
 # This parses /var/log/auth.log file, under the module name "syslog"
 # And search for "sshd" string into it, sending only that information.
@@ -214,3 +244,7 @@ module_plugin grep_log /var/log/auth.log Syslog sshd
 
 # Plugin for inventory on the agent (Only Enterprise)
 # module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users route
+
+# Log collection modules. Only for enterprise version, this will collect log files for forensic analysis.
+# This is for LOG monitoring, only on enterprise version
+#module_plugin grep_log_module /var/log/messages Syslog \.\*