diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
index 125c691ed..94157271f 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
@@ -614,6 +614,17 @@ public abstract class ConnectionConfiguration {
             return getThis();
         }
 
+        /**
+         * Set the information about the Proxy used for the connection.
+         *
+         * @param proxyInfo the Proxy information.
+         * @return a reference to this builder.
+         */
+        public B setProxyInfo(ProxyInfo proxyInfo) {
+            this.proxy = proxyInfo;
+            return getThis();
+        }
+
         /**
          * Allow <code>null</code> or the empty String as username.
          *