diff --git a/LibGit2Sharp/Commands/Fetch.cs b/LibGit2Sharp/Commands/Fetch.cs
index d61fca5a5..95242aab6 100644
--- a/LibGit2Sharp/Commands/Fetch.cs
+++ b/LibGit2Sharp/Commands/Fetch.cs
@@ -75,7 +75,7 @@ public static void Fetch(Repository repository, string remote, IEnumerable<strin
                     fetchOptions.CustomHeaders = GitStrArrayManaged.BuildFrom(options.CustomHeaders);
                 }
 
-                fetchOptions.ProxyOptions = new GitProxyOptions { Version = 1 };
+                fetchOptions.ProxyOptions = GitProxyOptionsFactory.CreateGitProxyOptions(options.ProxyOptions);
 
                 Proxy.git_remote_fetch(remoteHandle, refspecs, fetchOptions, logMessage);
             }
diff --git a/LibGit2Sharp/Core/GitProxyOptions.cs b/LibGit2Sharp/Core/GitProxyOptions.cs
index b62b8e08f..fb70ebb2f 100644
--- a/LibGit2Sharp/Core/GitProxyOptions.cs
+++ b/LibGit2Sharp/Core/GitProxyOptions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace LibGit2Sharp.Core
 {
@@ -20,4 +21,28 @@ internal struct GitProxyOptions
         public IntPtr CertificateCheck;
         public IntPtr CbPayload;
     }
+
+    internal static class GitProxyOptionsFactory
+    {
+        internal static GitProxyOptions CreateGitProxyOptions(ProxyOptions proxyOptions)
+        {
+            var options = new GitProxyOptions
+            {
+                Version = 1,
+                Type = GitProxyType.None,
+            };
+
+            if (proxyOptions != null)
+            {
+                options.Type = (GitProxyType)proxyOptions.ProxyType;
+
+                if (!string.IsNullOrWhiteSpace(proxyOptions.Url))
+                {
+                    options.Url = EncodingMarshaler.FromManaged(Encoding.UTF8, proxyOptions.Url);
+                }
+            }
+
+            return options;
+        }
+    }
 }
diff --git a/LibGit2Sharp/FetchOptionsBase.cs b/LibGit2Sharp/FetchOptionsBase.cs
index 751678cf9..f05069780 100644
--- a/LibGit2Sharp/FetchOptionsBase.cs
+++ b/LibGit2Sharp/FetchOptionsBase.cs
@@ -48,5 +48,15 @@ internal FetchOptionsBase()
         /// Completed operating on the current repository.
         /// </summary>
         public RepositoryOperationCompleted RepositoryOperationCompleted { get; set; }
+
+        /// <summary>
+        /// Configures operating behind a proxy
+        /// <para>
+        /// If not set, any proxy settings will be ignored
+        /// </para>
+        /// </summary>
+        public ProxyOptions ProxyOptions { get; set; }
     }
+
+    
 }
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
index 77971ea06..6417d33bc 100644
--- a/LibGit2Sharp/LibGit2Sharp.csproj
+++ b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -16,6 +16,7 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\libgit2sharp.snk</AssemblyOriginatorKeyFile>
+    <Platforms>AnyCPU;x64;x86</Platforms>
     <PackageIcon>square-logo.png</PackageIcon>
     <PackageLicenseFile>App_Readme/LICENSE.md</PackageLicenseFile>
   </PropertyGroup>
diff --git a/LibGit2Sharp/Network.cs b/LibGit2Sharp/Network.cs
index d5f032058..22c3e054a 100644
--- a/LibGit2Sharp/Network.cs
+++ b/LibGit2Sharp/Network.cs
@@ -118,7 +118,7 @@ private IEnumerable<Reference> ListReferencesInternal(string url, CredentialsHan
             using (RemoteHandle remoteHandle = BuildRemoteHandle(repository.Handle, url))
             {
                 GitRemoteCallbacks gitCallbacks = new GitRemoteCallbacks { version = 1 };
-                GitProxyOptions proxyOptions = new GitProxyOptions { Version = 1 };
+                GitProxyOptions proxyOptions = GitProxyOptionsFactory.CreateGitProxyOptions(null);
 
                 if (credentialsProvider != null)
                 {
@@ -375,7 +375,7 @@ public virtual void Push(Remote remote, IEnumerable<string> pushRefSpecs, PushOp
                                       {
                                           PackbuilderDegreeOfParallelism = pushOptions.PackbuilderDegreeOfParallelism,
                                           RemoteCallbacks = gitCallbacks,
-                                          ProxyOptions = new GitProxyOptions { Version = 1 },
+                                          ProxyOptions = GitProxyOptionsFactory.CreateGitProxyOptions(pushOptions.ProxyOptions)
                                       });
             }
         }
diff --git a/LibGit2Sharp/ProxyOptions.cs b/LibGit2Sharp/ProxyOptions.cs
new file mode 100644
index 000000000..69ded8233
--- /dev/null
+++ b/LibGit2Sharp/ProxyOptions.cs
@@ -0,0 +1,45 @@
+namespace LibGit2Sharp
+{
+    /// <summary>
+    /// Collection of parameters controlling proxy behavior.
+    /// </summary>
+    public sealed class ProxyOptions
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public ProxyOptions()
+        { }
+
+        /// <summary>
+        /// The type of proxy to use, by URL, auto-detect.
+        /// </summary>
+        public ProxyType ProxyType { get; set; }
+
+        /// <summary>
+        /// The URL of the proxy. (ProxyType must be Specified)
+        /// </summary>
+        public string Url { get; set; }
+    }
+
+    /// <summary>
+    /// The type of proxy to use.
+    /// </summary>
+    public enum ProxyType
+    {
+        /// <summary>
+        /// Do not attempt to connect through a proxy
+        /// If built against libcurl, it itself may attempt to connect
+        /// to a proxy if the environment variables specify it.
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// Try to auto-detect the proxy from the git configuration.
+        /// </summary>
+        Auto = 1,
+        /// <summary>
+        /// Connect via the URL given in the options
+        /// </summary>
+        Specified = 2
+    }
+}
diff --git a/LibGit2Sharp/PushOptions.cs b/LibGit2Sharp/PushOptions.cs
index 99c65dd8b..31e617aee 100644
--- a/LibGit2Sharp/PushOptions.cs
+++ b/LibGit2Sharp/PushOptions.cs
@@ -51,5 +51,13 @@ public sealed class PushOptions
         /// information about what updates will be performed.
         /// </summary>
         public PrePushHandler OnNegotiationCompletedBeforePush { get; set; }
+
+        /// <summary>
+        /// Configures operating behind a proxy
+        /// <para>
+        /// If not set, any proxy settings will be ignored
+        /// </para>
+        /// </summary>
+        public ProxyOptions ProxyOptions { get; set; }
     }
 }
diff --git a/LibGit2Sharp/RemoteOptions.cs b/LibGit2Sharp/RemoteOptions.cs
new file mode 100644
index 000000000..afaaf4328
--- /dev/null
+++ b/LibGit2Sharp/RemoteOptions.cs
@@ -0,0 +1,22 @@
+namespace LibGit2Sharp
+{
+    /// <summary>
+    /// Collection of parameters controlling reote behavior.
+    /// </summary>
+    public sealed class RemoteOptions
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public RemoteOptions()
+        { }
+
+        /// <summary>
+        /// Configures operating behind a proxy
+        /// <para>
+        /// If not set, any proxy settings will be ignored
+        /// </para>
+        /// </summary>
+        public ProxyOptions ProxyOptions { get; set; }
+    }
+}
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
index 721133cc6..9f7d03121 100644
--- a/LibGit2Sharp/Repository.cs
+++ b/LibGit2Sharp/Repository.cs
@@ -671,6 +671,23 @@ public static IEnumerable<Reference> ListRemoteReferences(string url)
         /// <param name="credentialsProvider">The <see cref="Func{Credentials}"/> used to connect to remote repository.</param>
         /// <returns>The references in the remote repository.</returns>
         public static IEnumerable<Reference> ListRemoteReferences(string url, CredentialsHandler credentialsProvider)
+        {
+            return ListRemoteReferences(url, credentialsProvider, new RemoteOptions());
+        }
+
+        /// <summary>
+        /// Lists the Remote Repository References.
+        /// </summary>
+        /// <para>
+        /// Does not require a local Repository. The retrieved
+        /// <see cref="IBelongToARepository.Repository"/>
+        /// throws <see cref="InvalidOperationException"/> in this case.
+        /// </para>
+        /// <param name="url">The url to list from.</param>
+        /// <param name="credentialsProvider">The <see cref="Func{Credentials}"/> used to connect to remote repository.</param>
+        /// <param name="options">Options for remote behavior <see cref="RemoteOptions"/></param>
+        /// <returns>The references in the remote repository.</returns>
+        public static IEnumerable<Reference> ListRemoteReferences(string url, CredentialsHandler credentialsProvider, RemoteOptions options)
         {
             Ensure.ArgumentNotNull(url, "url");
 
@@ -678,7 +695,7 @@ public static IEnumerable<Reference> ListRemoteReferences(string url, Credential
             using (RemoteHandle remoteHandle = Proxy.git_remote_create_anonymous(repositoryHandle, url))
             {
                 var gitCallbacks = new GitRemoteCallbacks { version = 1 };
-                var proxyOptions = new GitProxyOptions { Version = 1 };
+                var proxyOptions = GitProxyOptionsFactory.CreateGitProxyOptions(options?.ProxyOptions);
 
                 if (credentialsProvider != null)
                 {
@@ -768,7 +785,7 @@ public static string Clone(string sourceUrl, string workdirPath,
                 var gitCheckoutOptions = checkoutOptionsWrapper.Options;
 
                 var gitFetchOptions = fetchOptionsWrapper.Options;
-                gitFetchOptions.ProxyOptions = new GitProxyOptions { Version = 1 };
+                gitFetchOptions.ProxyOptions = GitProxyOptionsFactory.CreateGitProxyOptions(options.ProxyOptions);
                 gitFetchOptions.RemoteCallbacks = new RemoteCallbacks(options).GenerateCallbacks();
                 if (options.FetchOptions != null && options.FetchOptions.CustomHeaders != null)
                 {
diff --git a/LibGit2Sharp/SubmoduleCollection.cs b/LibGit2Sharp/SubmoduleCollection.cs
index fc508107a..db0b38127 100644
--- a/LibGit2Sharp/SubmoduleCollection.cs
+++ b/LibGit2Sharp/SubmoduleCollection.cs
@@ -100,11 +100,13 @@ public virtual void Update(string name, SubmoduleUpdateOptions options)
                     var remoteCallbacks = new RemoteCallbacks(options);
                     var gitRemoteCallbacks = remoteCallbacks.GenerateCallbacks();
 
+                    var proxyOptions = GitProxyOptionsFactory.CreateGitProxyOptions(options.ProxyOptions);
+
                     var gitSubmoduleUpdateOpts = new GitSubmoduleUpdateOptions
                     {
                         Version = 1,
                         CheckoutOptions = gitCheckoutOptions,
-                        FetchOptions = new GitFetchOptions { ProxyOptions = new GitProxyOptions { Version = 1 }, RemoteCallbacks = gitRemoteCallbacks },
+                        FetchOptions = new GitFetchOptions { ProxyOptions = proxyOptions, RemoteCallbacks = gitRemoteCallbacks },
                         CloneCheckoutStrategy = CheckoutStrategy.GIT_CHECKOUT_SAFE
                     };