diff --git a/README.md b/README.md
index 898887f14..900602a0b 100644
--- a/README.md
+++ b/README.md
@@ -236,12 +236,12 @@ If you like the project, a star on GitHub is always appreciated.
 
 # News and noteworthy
 
-* v0.9.10 - work in progress
+* v0.9.10 - 2020-02-16
     * Fixed a stupid error in the demo code that prohibits the correct receiver check activation - see https://github.com/phax/phase4/commit/796c054d972562d31fe33597b8f7938081b8183e for the resolution
     * Invoking the `AS4RequestHandler` error consumer also on asynchronous processing
     * Extended the error consumer interface of `AS4RequestHandler` from `Consumer` to `IAS4RequestHandlerErrorConsumer`
     * Extended the message metadata class `AS4IncomingMessageMetadata`
-    * Updated to ph-web 9.1.8
+    * Updated to ph-web 9.1.9
 * v0.9.9 - 2020-02-09
     * Removed the methods deprecated in v0.9.8
     * Updated to peppol-commons 8.x
diff --git a/phase4-lib/src/main/java/com/helger/phase4/messaging/AS4MessagingHelper.java b/phase4-lib/src/main/java/com/helger/phase4/messaging/AS4MessagingHelper.java
index 80f69ebce..779394590 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/messaging/AS4MessagingHelper.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/messaging/AS4MessagingHelper.java
@@ -1,3 +1,19 @@
+/**
+ * Copyright (C) 2015-2020 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.helger.phase4.messaging;
 
 import javax.annotation.Nonnull;
diff --git a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolHttpClientFactory.java b/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolHttpClientFactory.java
deleted file mode 100644
index 70a1eb3b6..000000000
--- a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolHttpClientFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.helger.phase4.peppol;
-
-import java.security.GeneralSecurityException;
-
-import org.apache.http.impl.client.HttpClientBuilder;
-
-import com.helger.httpclient.HttpClientFactory;
-import com.helger.phase4.CAS4Version;
-
-/**
- * Special {@link HttpClientFactory} with better defaults for Peppol.
- *
- * @author Philip Helger
- */
-public class Phase4PeppolHttpClientFactory extends HttpClientFactory
-{
-  public Phase4PeppolHttpClientFactory () throws GeneralSecurityException
-  {
-    super (new Phase4PeppolHttpClientSettings ());
-  }
-
-  @Override
-  public HttpClientBuilder createHttpClientBuilder ()
-  {
-    final HttpClientBuilder ret = super.createHttpClientBuilder ();
-    // Set an explicit user agent
-    ret.setUserAgent ("phase4/" + CAS4Version.BUILD_VERSION + " github.com/phax/phase4");
-    return ret;
-  }
-}
diff --git a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolHttpClientSettings.java b/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolHttpClientSettings.java
index 0416975cb..d3044ef0b 100644
--- a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolHttpClientSettings.java
+++ b/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolHttpClientSettings.java
@@ -23,6 +23,7 @@
 
 import com.helger.commons.ws.TrustManagerTrustAll;
 import com.helger.httpclient.HttpClientSettings;
+import com.helger.phase4.CAS4Version;
 
 /**
  * Special {@link HttpClientSettings} with better defaults for Peppol.
@@ -44,5 +45,8 @@ public Phase4PeppolHttpClientSettings () throws GeneralSecurityException
     setConnectionRequestTimeoutMS (100_000);
     setConnectionTimeoutMS (5_000);
     setSocketTimeoutMS (100_000);
+
+    // Set an explicit user agent
+    setUserAgent ("phase4/" + CAS4Version.BUILD_VERSION + " github.com/phax/phase4");
   }
 }
diff --git a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolSender.java b/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolSender.java
index 38e3f30c7..5ec175c3b 100644
--- a/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolSender.java
+++ b/phase4-peppol-client/src/main/java/com/helger/phase4/peppol/Phase4PeppolSender.java
@@ -657,7 +657,7 @@ protected AbstractBaseBuilder ()
       // Set default values
       try
       {
-        setHttpClientFactory (new Phase4PeppolHttpClientFactory ());
+        setHttpClientFactory (new HttpClientFactory (new Phase4PeppolHttpClientSettings ()));
         setCryptoFactory (AS4CryptoFactoryPropertiesFile.getDefaultInstance ());
         final IPModeResolver aPModeResolver = DefaultPModeResolver.DEFAULT_PMODE_RESOLVER;
         setPModeResolver (aPModeResolver);
@@ -674,8 +674,8 @@ protected AbstractBaseBuilder ()
 
     /**
      * Set the HTTP client factory to be used. By default an instance of
-     * {@link Phase4PeppolHttpClientFactory} is used and there is no need to
-     * invoke this method.
+     * {@link HttpClientFactory} is used and there is no need to invoke this
+     * method.
      *
      * @param aHttpClientFactory
      *        The new HTTP client factory to be used. May not be
diff --git a/phase4-peppol-server-webapp/pom.xml b/phase4-peppol-server-webapp/pom.xml
index 8c511b2bd..38f3fc0e0 100644
--- a/phase4-peppol-server-webapp/pom.xml
+++ b/phase4-peppol-server-webapp/pom.xml
@@ -143,7 +143,7 @@
             <exclude>**/*.cer</exclude>
             <exclude>**/*.mime</exclude>
             <exclude>**/*.mmd</exclude>
-            <exclude>as4-data/*</exclude>
+            <exclude>as4-data/**</exclude>
           </excludes>
         </configuration>
       </plugin>