Index: java/ModDepotAccess/.classpath
===================================================================
--- java/ModDepotAccess/.classpath	(revision 748)
+++ java/ModDepotAccess/.classpath	(revision 852)
@@ -3,10 +3,8 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="/_ThirdPartyLibs/httpclient/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="/_ThirdPartyLibs/httpclient/httpclient-4.2.2.jar"/>
-	<classpathentry kind="lib" path="/_ThirdPartyLibs/httpclient/httpcore-4.2.2.jar"/>
 	<classpathentry kind="lib" path="/_ThirdPartyLibs/JSON-java.jar"/>
 	<classpathentry kind="lib" path="/_ThirdPartyLibs/xstream-1.4.3.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/HTTPFileDownloader"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ProxySettings"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: java/ModDepotAccess/src/net/oni2/moddepot/DepotManager.java
===================================================================
--- java/ModDepotAccess/src/net/oni2/moddepot/DepotManager.java	(revision 748)
+++ java/ModDepotAccess/src/net/oni2/moddepot/DepotManager.java	(revision 852)
@@ -7,6 +7,6 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.UnknownHostException;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.Date;
 import java.util.Enumeration;
@@ -16,4 +16,6 @@
 import java.util.zip.ZipFile;
 
+import net.oni2.ProxySettings;
+import net.oni2.httpfiledownloader.FileDownloader;
 import net.oni2.moddepot.model.File;
 import net.oni2.moddepot.model.Node;
@@ -23,10 +25,5 @@
 import net.oni2.moddepot.model.TaxonomyTerm;
 import net.oni2.moddepot.model.TaxonomyVocabulary;
-import net.oni2.httpfiledownloader.FileDownloader;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpHead;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.impl.client.DefaultHttpClient;
+
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -214,20 +211,13 @@
 	 */
 	public boolean checkConnection() {
-		HttpRequestBase httpQuery = null;
-
 		try {
-			DefaultHttpClient httpclient = new DefaultHttpClient();
-			httpQuery = new HttpHead(DepotConfig.depotUrl);
-			HttpResponse response = httpclient.execute(httpQuery);
-			int code = response.getStatusLine().getStatusCode();
+			HttpURLConnection con = (HttpURLConnection) new URL(
+					DepotConfig.depotUrl).openConnection(ProxySettings
+					.getInstance().getProxy());
+			con.setRequestMethod("HEAD");
+			int code = con.getResponseCode();
 			return (code >= 200) && (code <= 299);
-		} catch (UnknownHostException e) {
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
 		} catch (IOException e) {
 			e.printStackTrace();
-		} finally {
-			if (httpQuery != null)
-				httpQuery.releaseConnection();
 		}
 		return false;