diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index d40f9ff77a..c903844cd8 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1458,7 +1458,7 @@ phutil_register_library_map(array(
     'PhabricatorPolicyAwareQuery' => 'infrastructure/query/policy/PhabricatorPolicyAwareQuery.php',
     'PhabricatorPolicyAwareTestQuery' => 'applications/policy/__tests__/PhabricatorPolicyAwareTestQuery.php',
     'PhabricatorPolicyCapability' => 'applications/policy/constants/PhabricatorPolicyCapability.php',
-    'PhabricatorPolicyConfigOptions' => 'applications/config/option/PhabricatorPolicyConfigOptions.php',
+    'PhabricatorPolicyConfigOptions' => 'applications/policy/config/PhabricatorPolicyConfigOptions.php',
     'PhabricatorPolicyConstants' => 'applications/policy/constants/PhabricatorPolicyConstants.php',
     'PhabricatorPolicyController' => 'applications/policy/controller/PhabricatorPolicyController.php',
     'PhabricatorPolicyDataTestCase' => 'applications/policy/__tests__/PhabricatorPolicyDataTestCase.php',
diff --git a/src/applications/config/option/PhabricatorPolicyConfigOptions.php b/src/applications/config/option/PhabricatorPolicyConfigOptions.php
deleted file mode 100644
index 0f828616f7..0000000000
--- a/src/applications/config/option/PhabricatorPolicyConfigOptions.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-final class PhabricatorPolicyConfigOptions
-  extends PhabricatorApplicationConfigOptions {
-
-  public function getName() {
-    return pht("Policy");
-  }
-
-  public function getDescription() {
-    return pht("Options relating to object visibility.");
-  }
-
-  public function getOptions() {
-    return array(
-      $this->newOption('policy.allow-public', 'bool', false)
-        ->setBoolOptions(
-          array(
-            pht('Allow Public Visibility'),
-            pht('Require Login')))
-        ->setSummary(pht("Allow users to set object visibility to public."))
-        ->setDescription(
-          pht(
-            "Phabricator allows you to set the visibility of objects (like ".
-            "repositories and source code) to 'Public', which means anyone ".
-            "on the internet can see them, even without being logged in. ".
-            "This is great for open source, but some installs may never want ".
-            "to make anything public, so this policy is disabled by default. ".
-            "You can enable it here, which will let you set the policy for ".
-            "objects to 'Public'. With this option disabled, the most open".
-            "policy is 'All Users', which means users must be logged in to ".
-            "view things.")),
-    );
-  }
-
-}
diff --git a/src/applications/policy/config/PhabricatorPolicyConfigOptions.php b/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
new file mode 100644
index 0000000000..b174560065
--- /dev/null
+++ b/src/applications/policy/config/PhabricatorPolicyConfigOptions.php
@@ -0,0 +1,44 @@
+<?php
+
+final class PhabricatorPolicyConfigOptions
+  extends PhabricatorApplicationConfigOptions {
+
+  public function getName() {
+    return pht("Policy");
+  }
+
+  public function getDescription() {
+    return pht("Options relating to object visibility.");
+  }
+
+  public function getOptions() {
+    return array(
+      $this->newOption('policy.allow-public', 'bool', false)
+        ->setBoolOptions(
+          array(
+            pht('Allow Public Visibility'),
+            pht('Require Login')))
+        ->setSummary(pht("Allow users to set object visibility to public."))
+        ->setDescription(
+          pht(
+            "Phabricator allows you to set the visibility of objects (like ".
+            "repositories and tasks) to 'Public', which means **anyone ".
+            "on the internet can see them, without needing to log in or ".
+            "have an account**.".
+            "\n\n".
+            "This is intended for open source projects. Many installs will ".
+            "never want to make anything public, so this policy is disabled ".
+            "by default. You can enable it here, which will let you set the ".
+            "policy for objects to 'Public'.".
+            "\n\n".
+            "Enabling this setting will immediately open up some features, ".
+            "like the user directory. Anyone on the internet will be able to ".
+            "access these features.".
+            "\n\n".
+            "With this setting disabled, the 'Public' policy is not ".
+            "available, and the most open policy is 'All Users' (which means ".
+            "users must have accounts and be logged in to view things).")),
+    );
+  }
+
+}