diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index e239d3f806..4fc75a7a86 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-11  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Config.pm,
+	  conf/pandora_server.conf.new: Added support for CURL web checks.
+
 2013-11-11  Sergio Martin <sergio.martin@artica.es>
 
 	* lib/PandoraFMS/Core.pm: Change the format of the comments when
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index e118fea73f..4d91e06039 100755
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -339,6 +339,9 @@ webserver 1
 
 web_threads 1
 
+# Uncomment to perform web checks with CURL instead of LWP.
+#web_engine curl
+
 # Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY).
 
 inventoryserver 1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index b86840b234..35df2911c7 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -223,6 +223,7 @@ sub pandora_load_config {
 	$pa_config->{"inventory_threads"} = 2; # 2.1
 	$pa_config->{"export_threads"} = 1; # 3.0
 	$pa_config->{"web_threads"} = 1; # 3.0
+	$pa_config->{"web_engine"} = 'lwp'; # 5.1
 	$pa_config->{"activate_gis"} = 0; # 3.1
 	$pa_config->{"location_error"} = 50; # 3.1
 	$pa_config->{"recon_reverse_geolocation_mode"} = 'disabled'; # 3.1
@@ -620,6 +621,9 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^web_threads\s([0-9]*)/i) {
 			$pa_config->{'web_threads'}= clean_blank($1); 
 		}
+		elsif ($parametro =~ m/^web_engine\s(.*)/i) {
+			$pa_config->{'web_engine'}= clean_blank($1); 
+		}
 		elsif ($parametro =~ m/^snmp_trapd\s(.*)/i) {
 			$pa_config->{'snmp_trapd'}= clean_blank($1); 
 		}