diff --git a/CHANGES b/CHANGES
index d6165b7c..70068459 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,10 @@ New Features
    * Add optional HTTP request parameter `filter` to `/admin/registry.json`
      allowing for simple filtering of the returned JSON. ``RB_ID=842784``
 
+   * Add admin endpoint, `/admin/toggles`, for
+     `c.t.finagle.toggle.StandardToggleMap` registered `Toggles`.
+     ``RB_ID=847434``
+
 Breaking API Changes
 ~~~~~~~~~~~~~~~~~~~~
 
diff --git a/src/main/scala/com/twitter/server/Admin.scala b/src/main/scala/com/twitter/server/Admin.scala
index 93c007ef..102eb40d 100644
--- a/src/main/scala/com/twitter/server/Admin.scala
+++ b/src/main/scala/com/twitter/server/Admin.scala
@@ -116,7 +116,7 @@ trait Admin { self: App with AdminHttpServer with Stats =>
         path = "/admin/registry.json", handler = new RegistryHandler,
         alias = "Registry", group = Some(Grouping.ProcessInfo), includeInIndex = true),
       Route(
-        path = "/admin/toggles.json", handler = new ToggleHandler(),
+        path = "/admin/toggles", handler = new ToggleHandler(),
         alias = "Toggles", group = Some(Grouping.ProcessInfo), includeInIndex = true),
       Route(
         path = "/favicon.ico", ResourceHandler.fromJar(