diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 14b478412..78611818b 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -65,11 +65,13 @@
         <EditTextPreference
             android:key="proxyHost"
             android:title="@string/proxy_host"
-            android:summary="@string/proxy_host_summary" />
+	    android:summary="@string/proxy_host_summary" 
+	    android:dependency="enableProxy" />
         <EditTextPreference
             android:key="proxyPort"
             android:title="@string/proxy_port"
-            android:summary="@string/proxy_port_summary" />
+            android:summary="@string/proxy_port_summary"
+	    android:dependency="enableProxy" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/other">
 		<CheckBoxPreference android:title="@string/cache_downloaded"
diff --git a/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java b/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
index b029f437a..b3a7cdb59 100644
--- a/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
+++ b/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java
@@ -152,15 +152,6 @@ public class PreferenceFragment
         } else if (key.equals(Preferences.PREF_ENABLE_PROXY)) {
             CheckBoxPreference pref = (CheckBoxPreference) findPreference(key);
             pref.setSummary(R.string.enable_proxy_summary);
-            Preference h = findPreference(Preferences.PREF_PROXY_HOST);
-            Preference p = findPreference(Preferences.PREF_PROXY_PORT);
-            if (pref.isChecked()) {
-                h.setEnabled(true);
-                p.setEnabled(true);
-            } else {
-                h.setEnabled(false);
-                p.setEnabled(false);
-            }
 
         } else if (key.equals(Preferences.PREF_PROXY_HOST)) {
             EditTextPreference textPref = (EditTextPreference) findPreference(key);