diff --git a/src/org/openbravo/retail/verystar/utils/verystar/VerystarUtils.java b/src/org/openbravo/retail/verystar/utils/verystar/VerystarUtils.java
index 74817400feaa4195ef1880834610fb30653524ec..f93091f5f4929c22847f6d6b324a53c0c9308b6f 100644
--- a/src/org/openbravo/retail/verystar/utils/verystar/VerystarUtils.java
+++ b/src/org/openbravo/retail/verystar/utils/verystar/VerystarUtils.java
@@ -22,11 +22,14 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.conn.params.ConnRoutePNames;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.exception.OBException;
@@ -197,8 +200,20 @@ public class VerystarUtils {
    * @return The HttpClient object used to execute the POST petition of Verystar API
    */
   private static CloseableHttpClient createClient(OBVERConfig obverConfig) {
-    CloseableHttpClient client = null;
     String proxyString = obverConfig.getProxy();
+    
+    Long timeout = obverConfig.getTimeout();
+    if (timeout == null) {
+      timeout = 15L;
+    }
+    timeout = timeout * 1000L;
+    
+    RequestConfig config = RequestConfig.custom()
+        .setConnectTimeout(timeout.intValue())
+        .setConnectionRequestTimeout(timeout.intValue())
+        .setSocketTimeout(timeout.intValue()).build();
+    HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
+      
     if (proxyString != null) {
       final String[] splitProtocolProxy = proxyString.split("://");
       final String proxyProtocol = splitProtocolProxy[0];
@@ -206,11 +221,9 @@ public class VerystarUtils {
       final String proxyIp = splitIpProxy[0];
       final int proxyPort = Integer.valueOf(splitIpProxy[1].replace("/", ""));
       HttpHost proxy = new HttpHost(proxyIp, proxyPort, proxyProtocol);
-      client = HttpClientBuilder.create().setProxy(proxy).build();
-    } else {
-      client = HttpClientBuilder.create().build();
+      httpClientBuilder.setProxy(proxy);
     }
-    return client;
+    return httpClientBuilder.setDefaultRequestConfig(config).build();
   }
 
   /**