diff --git a/scripts/fpm/warmup.php b/scripts/fpm/warmup.php
deleted file mode 100644
--- a/scripts/fpm/warmup.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * NOTE: This is an ADVANCED feature that improves performance but adds a lot
- * of complexity! This is only suitable for production servers because workers
- * won't pick up changes between when they spawn and when they handle a request.
- *
- * Phabricator spends a significant portion of its runtime loading classes
- * and functions, even with APC enabled. Since we have very rigidly-defined
- * rules about what can go in a module (specifically: no side effects), it
- * is safe to load all the libraries *before* we receive a request.
- *
- * Normally, SAPIs don't provide a way to do this, but with a patched PHP-FPM
- * SAPI you can provide a warmup file that it will execute before a request
- * is received.
- *
- * We're limited in what we can do here, since request information won't
- * exist yet, but we can load class and function definitions, which is what
- * we're really interested in.
- *
- * Once this file exists, the FCGI process will drop into its normal accept loop
- * and eventually process a request.
- */
-function __warmup__() {
-  $root = dirname(dirname(dirname(dirname(__FILE__))));
-  require_once $root.'/libphutil/src/__phutil_library_init__.php';
-  require_once $root.'/arcanist/src/__phutil_library_init__.php';
-  require_once $root.'/phabricator/src/__phutil_library_init__.php';
-
-  // Load every symbol. We could possibly refine this -- we don't need to load
-  // every Controller, for instance.
-  $loader = new PhutilSymbolLoader();
-  $loader->selectAndLoadSymbols();
-
-  define('__WARMUP__', true);
-}
-
-__warmup__();
diff --git a/scripts/install/update_phabricator.sh b/scripts/install/update_phabricator.sh
--- a/scripts/install/update_phabricator.sh
+++ b/scripts/install/update_phabricator.sh
@@ -9,15 +9,12 @@
 # to work without modifications.
 
 # NOTE: This script assumes you are running it from a directory which contains
-# arcanist/, libphutil/, and phabricator/.
+# arcanist/ and phabricator/.
 
 ROOT=`pwd` # You can hard-code the path here instead.
 
 ### UPDATE WORKING COPIES ######################################################
 
-cd $ROOT/libphutil
-git pull
-
 cd $ROOT/arcanist
 git pull
 
diff --git a/src/applications/conduit/controller/PhabricatorConduitController.php b/src/applications/conduit/controller/PhabricatorConduitController.php
--- a/src/applications/conduit/controller/PhabricatorConduitController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitController.php
@@ -156,7 +156,7 @@
 
     $parts = array();
 
-    $libphutil_path = 'path/to/libphutil/src/__phutil_library_init__.php';
+    $libphutil_path = 'path/to/arcanist/support/init/init-script.php';
 
     $parts[] = '<?php';
     $parts[] = "\n\n";
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -1151,7 +1151,7 @@
   /**
    * Get a parsed object representation of the repository's remote URI..
    *
-   * @return wild A @{class@libphutil:PhutilURI}.
+   * @return wild A @{class@arcanist:PhutilURI}.
    * @task uri
    */
   public function getRemoteURIObject() {
diff --git a/src/docs/contributor/adding_new_classes.diviner b/src/docs/contributor/adding_new_classes.diviner
--- a/src/docs/contributor/adding_new_classes.diviner
+++ b/src/docs/contributor/adding_new_classes.diviner
@@ -21,7 +21,7 @@
 @{class@phabricator:PhabricatorApplication}. It
 discovers available workflows in `arc` by looking at all of the subclasses of
 @{class@arcanist:ArcanistWorkflow}. It discovers available locales
-by looking at all of the subclasses of @{class@libphutil:PhutilLocale}.
+by looking at all of the subclasses of @{class@arcanist:PhutilLocale}.
 
 This pattern holds in many cases, so you can often add functionality by adding
 new classes with no other work. Phabricator will automatically discover and
@@ -49,8 +49,8 @@
 features, or get started on a larger project. Extending Phabricator like this
 imposes a small performance penalty compared to using a library.
 
-This directory exists in all libphutil libraries, so you can find similar
-directories in `arcanist/src/extensions/` and `libphutil/src/extensions/`.
+This directory exists in all libphutil libraries, so you can find a similar
+directory in `arcanist/src/extensions/`.
 
 For example, to add a new application, create a file like this one and add it
 to `phabricator/src/extensions/`.
@@ -171,8 +171,8 @@
 NOTE: If Phabricator isn't located next to your custom library, specify a
 path which actually points to the `phabricator/` directory.
 
-You do not need to declare dependencies on `arcanist` or `libphutil`,
-since `arc liberate` automatically loads them.
+You do not need to declare dependencies on `arcanist`, since `arc liberate`
+automatically loads them.
 
 Finally, edit your Phabricator config to tell it to load your library at
 runtime, by adding it to `load-libraries`:
@@ -206,8 +206,8 @@
 What You Can Extend And Invoke
 ==============================
 
-libphutil, Arcanist and Phabricator are strict about extensibility of classes
-and visibility of methods and properties. Most classes are marked `final`, and
+Arcanist and Phabricator are strict about extensibility of classes and
+visibility of methods and properties. Most classes are marked `final`, and
 methods have the minimum required visibility (protected or private). The goal
 of this strictness is to make it clear what you can safely extend, access, and
 invoke, so your code will keep working as the upstream changes.
@@ -215,8 +215,8 @@
 IMPORTANT: We'll still break APIs frequently. The upstream does not support
 extension development, and none of these APIs are stable.
 
-When developing libraries to work with libphutil, Arcanist and Phabricator, you
-should respect method and property visibility.
+When developing libraries to work with Arcanist and Phabricator, you should
+respect method and property visibility.
 
 If you want to add features but can't figure out how to do it without changing
 Phabricator code, here are some approaches you may be able to take:
diff --git a/src/docs/contributor/bug_reports.diviner b/src/docs/contributor/bug_reports.diviner
--- a/src/docs/contributor/bug_reports.diviner
+++ b/src/docs/contributor/bug_reports.diviner
@@ -47,10 +47,9 @@
     issues to be fixed in less than 24 hours, so even if you've updated recently
     you should update again. If you aren't sure how to update, see the next
     section.
-  - **Update Libraries**: Make sure `libphutil/`, `arcanist/` and
-    `phabricator/` are all up to date. Users often update `phabricator/` but
-    forget to update `arcanist/` or `libphutil/`. When you update, make sure you
-    update all three libraries.
+  - **Update Libraries**: Make sure `arcanist/` and `phabricator/` are all up
+    to date. Users often update `phabricator/` but forget to update `arcanist/`.
+    When you update, make sure you update all three libraries.
   - **Restart Apache or PHP-FPM**: Phabricator uses caches which don't get
     reset until you restart Apache or PHP-FPM. After updating, make sure you
     restart.
diff --git a/src/docs/contributor/contrib_intro.diviner b/src/docs/contributor/contrib_intro.diviner
--- a/src/docs/contributor/contrib_intro.diviner
+++ b/src/docs/contributor/contrib_intro.diviner
@@ -1,7 +1,7 @@
 @title Contributor Introduction
 @group contrib
 
-Introduction to contributing to Phabricator, Arcanist and libphutil.
+Introduction to contributing to Phabricator and Arcanist.
 
 Overview
 ========
diff --git a/src/docs/contributor/contributing_code.diviner b/src/docs/contributor/contributing_code.diviner
--- a/src/docs/contributor/contributing_code.diviner
+++ b/src/docs/contributor/contributing_code.diviner
@@ -212,9 +212,9 @@
 Writing and Submitting Patches
 ==================
 
-To actually submit a patch, run `arc diff` in `phabricator/`, `arcanist/`, or
-`libphutil/`. When executed in these directories, `arc` should automatically
-talk to the upstream install. You can add `epriestley` as a reviewer.
+To actually submit a patch, run `arc diff` in `phabricator/` or `arcanist/`.
+When executed in these directories, `arc` should automatically talk to the
+upstream install. You can add `epriestley` as a reviewer.
 
 You should read the relevant coding convention documents before you submit a
 change. If you're a new contributor, you don't need to worry about this too
diff --git a/src/docs/contributor/general_coding_standards.diviner b/src/docs/contributor/general_coding_standards.diviner
--- a/src/docs/contributor/general_coding_standards.diviner
+++ b/src/docs/contributor/general_coding_standards.diviner
@@ -2,7 +2,7 @@
 @group standards
 
 This document is a general coding standard for contributing to Phabricator,
-Arcanist, libphutil and Diviner.
+Arcanist, and Diviner.
 
 = Overview =
 
@@ -136,7 +136,7 @@
   Filesystem::writeFile('file.bak', $data);         //  Best
   do_something_dangerous();
 
-See @{article@libphutil:Command Execution} for details on the APIs used in this
+See @{article@arcanist:Command Execution} for details on the APIs used in this
 example.
 
 = Documentation, Comments and Formatting =
diff --git a/src/docs/contributor/internationalization.diviner b/src/docs/contributor/internationalization.diviner
--- a/src/docs/contributor/internationalization.diviner
+++ b/src/docs/contributor/internationalization.diviner
@@ -44,7 +44,7 @@
 Writing Translatable Code
 =========================
 
-Strings are marked for translation with @{function@libphutil:pht}.
+Strings are marked for translation with @{function@arcanist:pht}.
 
 The `pht()` function takes a string (and possibly some parameters) and returns
 the translated version of that string in the current viewer's locale, if a
@@ -68,7 +68,7 @@
   - Use parameters to create strings containing user names, object names, etc.
   - Translate full sentences, not sentence fragments.
   - Let the translation framework handle plural rules.
-  - Use @{class@libphutil:PhutilNumber} for numbers.
+  - Use @{class@arcanist:PhutilNumber} for numbers.
   - Let the translation framework handle subject gender rules.
   - Translate all human-readable text, even exceptions and error messages.
 
@@ -323,7 +323,7 @@
 languages, and languages like Czech also require verb agreement.
 
 When a parameter refers to a gendered person, pass an object which implements
-@{interface@libphutil:PhutilPerson} to `pht()` so translators can provide
+@{interface@arcanist:PhutilPerson} to `pht()` so translators can provide
 gendered translation variants.
 
 ```lang=php
@@ -361,8 +361,8 @@
 In cases where similar error or exception text is often repeated, it is
 probably appropriate to define an exception for that category of error rather
 than write the text out repeatedly, anyway. Two examples are
-@{class@libphutil:PhutilInvalidStateException} and
-@{class@libphutil:PhutilMethodNotImplementedException}, which mostly exist to
+@{class@arcanist:PhutilInvalidStateException} and
+@{class@arcanist:PhutilMethodNotImplementedException}, which mostly exist to
 produce a consistent message about a common error state in a convenient way.
 
 There are a handful of error strings in the codebase which may be used before
diff --git a/src/docs/contributor/php_coding_standards.diviner b/src/docs/contributor/php_coding_standards.diviner
--- a/src/docs/contributor/php_coding_standards.diviner
+++ b/src/docs/contributor/php_coding_standards.diviner
@@ -2,13 +2,13 @@
 @group standards
 
 This document describes PHP coding standards for Phabricator and related
-projects (like Arcanist and libphutil).
+projects (like Arcanist).
 
 = Overview =
 
 This document outlines technical and style guidelines which are followed in
-libphutil. Contributors should also follow these guidelines. Many of these
-guidelines are automatically enforced by lint.
+Phabricator and Arcanist. Contributors should also follow these guidelines.
+Many of these guidelines are automatically enforced by lint.
 
 These guidelines are essentially identical to the Facebook guidelines, since I
 basically copy-pasted them. If you are already familiar with the Facebook
diff --git a/src/docs/contributor/rendering_html.diviner b/src/docs/contributor/rendering_html.diviner
--- a/src/docs/contributor/rendering_html.diviner
+++ b/src/docs/contributor/rendering_html.diviner
@@ -13,13 +13,13 @@
 This document describes the right way to build HTML components so they are safe
 from XSS and render correctly. Broadly:
 
-  - Use @{function@libphutil:phutil_tag} (and @{function:javelin_tag}) to build
+  - Use @{function@arcanist:phutil_tag} (and @{function:javelin_tag}) to build
     tags.
-  - Use @{function@libphutil:hsprintf} where @{function@libphutil:phutil_tag}
+  - Use @{function@arcanist:hsprintf} where @{function@arcanist:phutil_tag}
     is awkward.
   - Combine elements with arrays, not string concatenation.
   - @{class:AphrontView} subclasses should return a
-    @{class@libphutil:PhutilSafeHTML} object from their `render()` method.
+    @{class@arcanist:PhutilSafeHTML} object from their `render()` method.
   - @{class:AphrontView} subclasses act like tags when rendering.
   - @{function:pht} has some special rules.
   - There are some other things that you should be aware of.
@@ -28,7 +28,7 @@
 
 = Building Tags: phutil_tag() =
 
-Build HTML tags with @{function@libphutil:phutil_tag}. For example:
+Build HTML tags with @{function@arcanist:phutil_tag}. For example:
 
   phutil_tag(
     'div',
@@ -37,10 +37,10 @@
     ),
     $content);
 
-@{function@libphutil:phutil_tag} will properly escape the content and all the
-attributes, and return a @{class@libphutil:PhutilSafeHTML} object. The rendering
+@{function@arcanist:phutil_tag} will properly escape the content and all the
+attributes, and return a @{class@arcanist:PhutilSafeHTML} object. The rendering
 pipeline knows that this object represents a properly escaped HTML tag. This
-allows @{function@libphutil:phutil_tag} to render tags with other tags as
+allows @{function@arcanist:phutil_tag} to render tags with other tags as
 content correctly (without double-escaping):
 
   phutil_tag(
@@ -52,14 +52,14 @@
       $content));
 
 In Phabricator, the @{function:javelin_tag} function is similar to
-@{function@libphutil:phutil_tag}, but provides special handling for the
+@{function@arcanist:phutil_tag}, but provides special handling for the
 `sigil` and `meta` attributes.
 
 = Building Blocks: hsprintf() =
 
-Sometimes, @{function@libphutil:phutil_tag} can be particularly awkward to
-use. You can use @{function@libphutil:hsprintf} to build larger and more
-complex blocks of HTML, when @{function@libphutil:phutil_tag} is a poor fit.
+Sometimes, @{function@arcanist:phutil_tag} can be particularly awkward to
+use. You can use @{function@arcanist:hsprintf} to build larger and more
+complex blocks of HTML, when @{function@arcanist:phutil_tag} is a poor fit.
 @{function:hsprintf} has `sprintf()` semantics, but `%s` escapes HTML:
 
   // Safely build fragments or unwieldy blocks.
@@ -72,13 +72,13 @@
   - You need to build a block with a lot of tags, like a table with rows and
     cells.
   - You need to build part of a tag (usually you should avoid this, but if you
-    do need to, @{function@libphutil:phutil_tag} can not do it).
+    do need to, @{function@arcanist:phutil_tag} can not do it).
 
 Note that it is unsafe to provide any user-controlled data to the first
-parameter of @{function@libphutil:hsprintf} (the `sprintf()`-style pattern).
+parameter of @{function@arcanist:hsprintf} (the `sprintf()`-style pattern).
 
-Like @{function@libphutil:phutil_tag}, this function returns a
-@{class@libphutil:PhutilSafeHTML} object.
+Like @{function@arcanist:phutil_tag}, this function returns a
+@{class@arcanist:PhutilSafeHTML} object.
 
 = Composing Tags =
 
@@ -99,7 +99,7 @@
   // Render a tag containing other tags safely.
   phutil_tag('div', array(), array($header, $body));
 
-If you concatenate @{class@libphutil:PhutilSafeHTML} objects, they revert to
+If you concatenate @{class@arcanist:PhutilSafeHTML} objects, they revert to
 normal strings and are no longer marked as properly escaped tags.
 
 (In the future, these objects may stop converting to strings, but for now they
@@ -118,7 +118,7 @@
 = AphrontView Classes =
 
 Subclasses of @{class:AphrontView} in Phabricator should return a
-@{class@libphutil:PhutilSafeHTML} object. The easiest way to do this is to
+@{class@arcanist:PhutilSafeHTML} object. The easiest way to do this is to
 return `phutil_tag()` or `javelin_tag()`:
 
   return phutil_tag('div', ...);
@@ -130,8 +130,8 @@
 = Internationalization: pht() =
 
 The @{function:pht} function has some special rules. If any input to
-@{function:pht} is a @{class@libphutil:PhutilSafeHTML} object, @{function:pht}
-returns a @{class@libphutil:PhutilSafeHTML} object itself. Otherwise, it returns
+@{function:pht} is a @{class@arcanist:PhutilSafeHTML} object, @{function:pht}
+returns a @{class@arcanist:PhutilSafeHTML} object itself. Otherwise, it returns
 normal text.
 
 This is generally safe because translations are not permitted to have more tags
@@ -146,23 +146,23 @@
 NOTE: This section describes dangerous methods which can bypass XSS protections.
 If possible, do not use them.
 
-You can build @{class@libphutil:PhutilSafeHTML} out of a string explicitly by
+You can build @{class@arcanist:PhutilSafeHTML} out of a string explicitly by
 calling @{function:phutil_safe_html} on it. This is **dangerous**, because if
 you are wrong and the string is not actually safe, you have introduced an XSS
 vulnerability. Consequently, you should avoid calling this if possible.
 
-You can use @{function@libphutil:phutil_escape_html_newlines} to escape HTML
+You can use @{function@arcanist:phutil_escape_html_newlines} to escape HTML
 while converting newlines to `<br />`. You should not need to explicitly use
-@{function@libphutil:phutil_escape_html} anywhere.
+@{function@arcanist:phutil_escape_html} anywhere.
 
 If you need to apply a string function (such as `trim()`) to safe HTML, use
-@{method@libphutil:PhutilSafeHTML::applyFunction}.
+@{method@arcanist:PhutilSafeHTML::applyFunction}.
 
-If you need to extract the content of a @{class@libphutil:PhutilSafeHTML}
+If you need to extract the content of a @{class@arcanist:PhutilSafeHTML}
 object, you should call `getHTMLContent()`, not cast it to a string. Eventually,
 we would like to remove the string cast entirely.
 
-Functions @{function@libphutil:phutil_tag} and @{function@libphutil:hsprintf}
+Functions @{function@arcanist:phutil_tag} and @{function@arcanist:hsprintf}
 are not safe if you pass the user input for the tag or attribute name. All the
 following examples are dangerous:
 
diff --git a/src/docs/contributor/unit_tests.diviner b/src/docs/contributor/unit_tests.diviner
--- a/src/docs/contributor/unit_tests.diviner
+++ b/src/docs/contributor/unit_tests.diviner
@@ -1,13 +1,13 @@
 @title Writing Unit Tests
 @group developer
 
-Simple guide to libphutil, Arcanist and Phabricator unit tests.
+Simple guide to Arcanist and Phabricator unit tests.
 
 = Overview =
 
-libphutil, Arcanist and Phabricator provide and use a simple unit test
-framework. This document is aimed at project contributors and describes how to
-use it to add and run tests in these projects or other libphutil libraries.
+Arcanist and Phabricator provide and use a simple unit test framework. This
+document is aimed at project contributors and describes how to use it to add
+and run tests in these projects or other libphutil libraries.
 
 In the general case, you can integrate `arc` with a custom unit test engine
 (like PHPUnit or any other unit testing library) to run tests in other projects.
@@ -16,7 +16,7 @@
 
 = Adding Tests =
 
-To add new tests to a libphutil, Arcanist or Phabricator module:
+To add new tests to a Arcanist or Phabricator module:
 
   - Create a `__tests__/` directory in the module if it doesn't exist yet.
   - Add classes to the `__tests__/` directory which extend from
diff --git a/src/docs/flavor/php_pitfalls.diviner b/src/docs/flavor/php_pitfalls.diviner
--- a/src/docs/flavor/php_pitfalls.diviner
+++ b/src/docs/flavor/php_pitfalls.diviner
@@ -18,7 +18,7 @@
 intermediate arrays and copies every element it has previously seen each time
 you iterate.
 
-In a libphutil environment, you can use @{function@libphutil:array_mergev}
+In a libphutil environment, you can use @{function@arcanist:array_mergev}
 instead.
 
 = `var_export()` Hates Baby Animals =
@@ -147,7 +147,7 @@
 instead, and use it to reorder the original array.
 
 In a libphutil environment, you can often do this easily with
-@{function@libphutil:isort} or @{function@libphutil:msort}.
+@{function@arcanist:isort} or @{function@arcanist:msort}.
 
 = `array_intersect()` and `array_diff()` are Also Slow =
 
@@ -270,7 +270,7 @@
 
 ...you'll probably invent a very interesting, very novel solution that is very
 wrong. In a libphutil environment, solve this problem with
-@{function@libphutil:newv}. Elsewhere, copy `newv()`'s implementation.
+@{function@arcanist:newv}. Elsewhere, copy `newv()`'s implementation.
 
 = Equality is not Transitive =
 
diff --git a/src/docs/user/configuration/managing_daemons.diviner b/src/docs/user/configuration/managing_daemons.diviner
--- a/src/docs/user/configuration/managing_daemons.diviner
+++ b/src/docs/user/configuration/managing_daemons.diviner
@@ -65,7 +65,7 @@
 
 You can get a list of launchable daemons with **phd list**:
 
-  - **libphutil test daemons** are not generally useful unless you are
+  - **test daemons** are not generally useful unless you are
     developing daemon infrastructure or debugging a daemon problem;
   - **PhabricatorTaskmasterDaemon** performs work from a task queue;
   - **PhabricatorRepositoryPullLocalDaemon** daemons track repositories, for
diff --git a/src/docs/user/configuration/troubleshooting_https.diviner b/src/docs/user/configuration/troubleshooting_https.diviner
--- a/src/docs/user/configuration/troubleshooting_https.diviner
+++ b/src/docs/user/configuration/troubleshooting_https.diviner
@@ -32,7 +32,7 @@
 You can self-sign a certificate by creating your own CA, but clients will not
 trust it by default. They need to add the CA as a trusted authority.
 
-For instructions on adding CAs, see `libphutil/resources/ssl/README`.
+For instructions on adding CAs, see `arcanist/resources/ssl/README`.
 
 If you'd prefer that `arc` not verify the identity of the server whatsoever, you
 can use the `https.blindly-trust-domains` setting. This will make it
diff --git a/src/docs/user/field/darkconsole.diviner b/src/docs/user/field/darkconsole.diviner
--- a/src/docs/user/field/darkconsole.diviner
+++ b/src/docs/user/field/darkconsole.diviner
@@ -48,7 +48,7 @@
 
 The "Error Log" plugin shows errors that occurred while generating the page,
 similar to the httpd `error.log`. You can send information to the error log
-explicitly with the @{function@libphutil:phlog} function.
+explicitly with the @{function@arcanist:phlog} function.
 
 If errors occurred, a red dot will appear on the plugin tab.
 
diff --git a/src/docs/user/userguide/arcanist.diviner b/src/docs/user/userguide/arcanist.diviner
--- a/src/docs/user/userguide/arcanist.diviner
+++ b/src/docs/user/userguide/arcanist.diviner
@@ -90,15 +90,8 @@
 
 To install Arcanist, pick an install directory and clone the code from GitHub:
 
-  some_install_path/ $ git clone https://github.com/phacility/libphutil.git
   some_install_path/ $ git clone https://github.com/phacility/arcanist.git
 
-This should leave you with a directory structure like this
-
-  some_install_path/    # Wherever you chose to install it.
-    arcanist/           # Arcanist-specific code and libraries.
-    libphutil/          # A shared library Arcanist depends upon.
-
 Now add `some_install_path/arcanist/bin/` to your PATH environment variable.
 When you type "arc", you should see something like this:
 
@@ -110,8 +103,7 @@
   - On Windows: @{article:Arcanist User Guide: Windows}
   - On Mac OS X: @{article:Arcanist User Guide: Mac OS X}
 
-You can later upgrade Arcanist and libphutil to the latest versions with
-`arc upgrade`:
+You can later upgrade Arcanist to the latest version with `arc upgrade`:
 
   $ arc upgrade
 
@@ -122,7 +114,7 @@
 able to use:
 
   - Facebook does most development on development servers, which have a standard
-    environment and NFS mounts. Arcanist and libphutil themselves live on an
+    environment and NFS mounts. Arcanist lives on an
     NFS mount, and the default `.bashrc` adds them to the PATH. Updating the
     mount source updates everyone's versions, and new employees have a working
     `arc` when they first log in.
diff --git a/src/docs/user/userguide/arcanist_coverage.diviner b/src/docs/user/userguide/arcanist_coverage.diviner
--- a/src/docs/user/userguide/arcanist_coverage.diviner
+++ b/src/docs/user/userguide/arcanist_coverage.diviner
@@ -27,9 +27,9 @@
 If the test engine enables coverage by default, it will be uploaded to
 Differential and displayed in the right gutter when viewing diffs.
 
-= Enabling Coverage for libphutil, Arcanist and Phabricator =
+= Enabling Coverage for Arcanist and Phabricator =
 
-If you're contributing, libphutil, Arcanist and Phabricator support coverage if
+If you're contributing, Arcanist and Phabricator support coverage if
 you install Xdebug:
 
 http://xdebug.org/
diff --git a/src/docs/user/userguide/arcanist_quick_start.diviner b/src/docs/user/userguide/arcanist_quick_start.diviner
--- a/src/docs/user/userguide/arcanist_quick_start.diviner
+++ b/src/docs/user/userguide/arcanist_quick_start.diviner
@@ -20,9 +20,6 @@
 
 Then install Arcanist itself:
 
-  $ mkdir somewhere/
-  $ cd somewhere/
-  somewhere/ $ git clone https://github.com/phacility/libphutil.git
   somewhere/ $ git clone https://github.com/phacility/arcanist.git
 
 Add `arc` to your path:
diff --git a/src/docs/user/userguide/conduit.diviner b/src/docs/user/userguide/conduit.diviner
--- a/src/docs/user/userguide/conduit.diviner
+++ b/src/docs/user/userguide/conduit.diviner
@@ -19,8 +19,7 @@
 the API and making calls. This is the best starting point for learning about
 the API. See the next section for details.
 
-`ConduitClient`: This is the official client available in `libphutil`, and
-the one used by `arc`.
+`ConduitClient`: This is the official client available in `arcanist`.
 
 `arc call-conduit`: You can use this `arc` command to execute low-level
 Conduit calls by piping JSON in to stdin. This can provide a simple way
diff --git a/src/docs/user/userguide/diffusion_managing.diviner b/src/docs/user/userguide/diffusion_managing.diviner
--- a/src/docs/user/userguide/diffusion_managing.diviner
+++ b/src/docs/user/userguide/diffusion_managing.diviner
@@ -55,10 +55,9 @@
 install but do not need to be globally unique, so you are free to use the
 single-letter callsigns for brevity. For example, Facebook uses "E" for the
 Engineering repository, "O" for the Ops repository, "Y" for a Yum package
-repository, and so on, while Phabricator uses "P", "ARC", "PHU" for libphutil,
-and "J" for Javelin. Keeping callsigns brief will make them easier to use, and
-the use of one-character callsigns is encouraged if they are reasonably
-evocative.
+repository, and so on, while Phabricator uses "P" and Arcanist uses "ARC".
+Keeping callsigns brief will make them easier to use, and the use of
+one-character callsigns is encouraged if they are reasonably evocative.
 
 If you configure a callsign like `XYZ`, Phabricator will activate callsign URIs
 and activate the callsign identifier (like `rXYZ`) for the repository. These
diff --git a/src/docs/user/userguide/diffusion_symbols.diviner b/src/docs/user/userguide/diffusion_symbols.diviner
--- a/src/docs/user/userguide/diffusion_symbols.diviner
+++ b/src/docs/user/userguide/diffusion_symbols.diviner
@@ -83,8 +83,8 @@
     You can leave this blank for "All languages".
   - **Uses Symbols From**: If this project depends on other repositories, add
     the other repositories which symbols should be looked for here. For example,
-    Phabricator lists "Arcanist" and "libphutil" because it uses classes and
-    functions from these repositories.
+    Phabricator lists "Arcanist" because it uses classes and functions defined
+    in `arcanist/`.
 
 == External Symbols ==
 
diff --git a/src/docs/user/userguide/drydock_hosts.diviner b/src/docs/user/userguide/drydock_hosts.diviner
--- a/src/docs/user/userguide/drydock_hosts.diviner
+++ b/src/docs/user/userguide/drydock_hosts.diviner
@@ -41,7 +41,7 @@
 properly with any software you need, and have tools like `git`, `hg` or `svn`
 that may be required to interact with working copies.
 
-You do **not** need to install PHP, arcanist, libphutil or Phabricator on the
+You do **not** need to install PHP, arcanist, or Phabricator on the
 hosts unless you are specifically running `arc` commands.
 
 **You must configure authentication.** Drydock also does not handle credentials
diff --git a/src/docs/user/userguide/events.diviner b/src/docs/user/userguide/events.diviner
--- a/src/docs/user/userguide/events.diviner
+++ b/src/docs/user/userguide/events.diviner
@@ -23,7 +23,7 @@
 
 To install event listeners in Phabricator, follow these steps:
 
-  - Write a listener class which extends @{class@libphutil:PhutilEventListener}.
+  - Write a listener class which extends @{class@arcanist:PhutilEventListener}.
   - Add it to a libphutil library, or create a new library (for instructions,
     see @{article@phabcontrib:Adding New Classes}.
   - Configure Phabricator to load the library by adding it to `load-libraries`
@@ -40,7 +40,7 @@
 
 To install event listeners in Arcanist, follow these steps:
 
-  - Write a listener class which extends @{class@libphutil:PhutilEventListener}.
+  - Write a listener class which extends @{class@arcanist:PhutilEventListener}.
   - Add it to a libphutil library, or create a new library (for instructions,
     see @{article@phabcontrib:Adding New Classes}.
   - Configure Phabricator to load the library by adding it to `load`
diff --git a/src/docs/user/userguide/utf8.diviner b/src/docs/user/userguide/utf8.diviner
--- a/src/docs/user/userguide/utf8.diviner
+++ b/src/docs/user/userguide/utf8.diviner
@@ -22,48 +22,6 @@
     Encodings" below). This is not completely supported, and repositories with
     files that have multiple encodings are not supported.
 
-= Detecting and Repairing Files =
-
-It is recommended that you write source files only in ASCII text, but
-Phabricator fully supports UTF-8 source files.
-
-If you have a project which isn't valid UTF-8 because a few files have random
-binary nonsense in them, there is a script in libphutil which can help you
-identify and fix them:
-
-  project/ $ libphutil/scripts/utils/utf8.php
-
-Generally, run this script on all source files with "-t" to find files with bad
-byte ranges, and then run it without "-t" on each file to identify where there
-are problems. For example:
-
-  project/ $ find . -type f -name '*.c' -print0 | xargs -0 -n256 ./utf8 -t
-  ./hello_world.c
-
-If this script exits without output, you're in good shape and all the files that
-were identified are valid UTF-8. If it found some problems, you need to repair
-them. You can identify the specific problems by omitting the "-t" flag:
-
-  project/ $ ./utf8.php hello_world.c
-  FAIL  hello_world.c
-
-    3  main()
-    4  {
-    5      printf ("Hello World<0xE9><0xD6>!\n");
-    6  }
-    7
-
-This shows the offending bytes on line 5 (in the actual console display, they'll
-be highlighted). Often a codebase will mostly be valid UTF-8 but have a few
-scattered files that have other things in them, like curly quotes which someone
-copy-pasted from Word into a comment. In these cases, you can just manually
-identify and fix the problems pretty easily.
-
-If you have a prohibitively large number of UTF-8 issues in your source code,
-Phabricator doesn't include any default tools to help you process them in a
-systematic way. You could hack up `utf8.php` as a starting point, or use other
-tools to batch-process your source files.
-
 = Support for Alternate Encodings =
 
 Phabricator has some support for encodings other than UTF-8.
diff --git a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php
--- a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php
+++ b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php
@@ -66,7 +66,8 @@
     $class = $this->getTaskClass();
 
     try {
-      // NOTE: If the class does not exist, libphutil will throw an exception.
+      // NOTE: If the class does not exist, the autoloader will throw an
+      // exception.
       class_exists($class);
     } catch (PhutilMissingSymbolException $ex) {
       throw new PhabricatorWorkerPermanentFailureException(
diff --git a/src/infrastructure/storage/lisk/LiskDAO.php b/src/infrastructure/storage/lisk/LiskDAO.php
--- a/src/infrastructure/storage/lisk/LiskDAO.php
+++ b/src/infrastructure/storage/lisk/LiskDAO.php
@@ -116,7 +116,7 @@
  *   $pugs = $dog->loadAllWhere('breed = %s', 'Pug');
  *   $sawyer = $dog->loadOneWhere('name = %s', 'Sawyer');
  *
- * These methods work like @{function@libphutil:queryfx}, but only take half of
+ * These methods work like @{function@arcanist:queryfx}, but only take half of
  * a query (the part after the WHERE keyword). Lisk will handle the connection,
  * columns, and object construction; you are responsible for the rest of it.
  * @{method:loadAllWhere} returns a list of objects, while
diff --git a/support/startup/PhabricatorStartup.php b/support/startup/PhabricatorStartup.php
--- a/support/startup/PhabricatorStartup.php
+++ b/support/startup/PhabricatorStartup.php
@@ -67,7 +67,7 @@
    */
   public static function getMicrosecondsSinceStart() {
     // This is the same as "phutil_microseconds_since()", but we may not have
-    // loaded libphutil yet.
+    // loaded libraries yet.
     return (int)(1000000 * (microtime(true) - self::getStartTime()));
   }
 
diff --git a/webroot/rsrc/externals/javelin/docs/concepts/behaviors.diviner b/webroot/rsrc/externals/javelin/docs/concepts/behaviors.diviner
--- a/webroot/rsrc/externals/javelin/docs/concepts/behaviors.diviner
+++ b/webroot/rsrc/externals/javelin/docs/concepts/behaviors.diviner
@@ -124,7 +124,7 @@
     the full power of arbitrary JS execution.
   - It's utterly hideous.
 
-In 2007/2008, we introduced @{function@libphutil:jsprintf} and a function called
+In 2007/2008, we introduced @{function@arcanist:jsprintf} and a function called
 onloadRegister() to solve some of the obvious problems:
 
   lang=php
diff --git a/webroot/rsrc/externals/javelin/docs/facebook.diviner b/webroot/rsrc/externals/javelin/docs/facebook.diviner
deleted file mode 100644
--- a/webroot/rsrc/externals/javelin/docs/facebook.diviner
+++ /dev/null
@@ -1,82 +0,0 @@
-@title Javelin at Facebook
-@group facebook
-
-Information specific to Javelin at Facebook.
-
-= Building Support Scripts =
-
-Javelin now ships with the source to build several libfbjs-based binaries, which
-serve to completely sever its dependencies on trunk:
-
-  - `javelinsymbols`: used for lint
-  - `jsast`: used for documentation generation
-  - `jsxmin`: used to crush packages
-
-To build these, first build libfbjs:
-
-  javelin/ $ cd externals/libfbjs
-  javelin/externals/libfbjs/ $ CXX=/usr/bin/g++ make
-
-Note that **you must specify CXX explicitly because the default CXX is broken**.
-
-Now you should be able to build the individual binaries:
-
-  javelin/ $ cd support/javelinsymbols
-  javelin/support/javelinsymbols $ CXX=/usr/bin/g++ make
-
-  javelin/ $ cd support/jsast
-  javelin/support/jsast $ CXX=/usr/bin/g++ make
-
-  javelin/ $ cd support/jsxmin
-  javelin/support/jsxmin $ CXX=/usr/bin/g++ make
-
-= Synchronizing Javelin =
-
-To synchronize Javelin **from** Facebook trunk, run the synchronize script:
-
-  javelin/ $ ./scripts/sync-from-facebook.php ~/www
-
-...where `~/www` is the root you want to pull Javelin files from. The script
-will copy files out of `html/js/javelin` and build packages, and leave the
-results in your working copy. From there you can review changes and commit, and
-then push, diff, or send a pull request.
-
-To synchronize Javelin **to** Facebook trunk, run the, uh, reverse-synchronize
-script:
-
-  javelin/ $ ./scripts/sync-to-facebook.php ~/www
-
-...where `~/www` is the root you want to push Javelin files to. The script
-will copy files out of the working copy into your `www` and leave you with a
-dirty `www`. From there you can review changes.
-
-Once Facebook moves to pure git for `www` we can probably just submodule
-Javelin into it and get rid of all this nonsense, but the mixed SVN/git
-environment makes that difficult until then.
-
-= Building Documentation =
-
-Check out `diviner` and `libphutil` from Facebook github, and put them in a
-directory with `javelin`:
-
-  somewhere/ $ ls
-  diviner/
-  javelin/
-  libphutil/
-  somewhere/ $
-
-Now run `diviner` on `javelin`:
-
-  somewhere/ $ cd javelin
-  somewhere/javelin/ $ ../diviner/bin/diviner .
-  [DivinerArticleEngine] Generating documentation for 48 files...
-  [JavelinDivinerEngine] Generating documentation for 74 files...
-  somewhere/javelin/ $
-
-Documentation is now available in `javelin/docs/`.
-
-= Editing javelinjs.com =
-
-The source for javelinjs.com lives in `javelin/support/webroot/`. The site
-itself is served off the phabricator.com host. You need access to that host to
-push it.