diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 0328455a..57f15d17 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1,203 +1,205 @@
 <?php
 
 /**
  * This file is automatically generated. Use 'phutil_mapper.php' to rebuild it.
  * @generated
  */
 
 phutil_register_library_map(array(
   'class' =>
   array(
     'AbstractDirectedGraph' => 'utils/abstractgraph',
     'AbstractDirectedGraphTestCase' => 'utils/abstractgraph/__tests__',
     'BaseHTTPFuture' => 'future/http/base',
     'CommandException' => 'future/exec',
     'ConduitClient' => 'conduit/client',
     'ConduitClientException' => 'conduit/client',
     'ConduitFuture' => 'conduit/client',
     'ExecFuture' => 'future/exec',
     'FileFinder' => 'filesystem/filefinder',
     'FileList' => 'filesystem/filelist',
     'Filesystem' => 'filesystem',
     'FilesystemException' => 'filesystem',
     'Future' => 'future',
     'FutureIterator' => 'future',
     'FutureProxy' => 'future/proxy',
     'HTTPFuture' => 'future/http/http',
     'HTTPFutureResponseStatus' => 'future/http/status/base',
     'HTTPFutureResponseStatusCURL' => 'future/http/status/curl',
     'HTTPFutureResponseStatusHTTP' => 'future/http/status/http',
     'HTTPFutureResponseStatusParse' => 'future/http/status/parse',
     'HTTPFutureResponseStatusTransport' => 'future/http/status/transport',
     'HTTPSFuture' => 'future/http/https',
     'ImmediateFuture' => 'future/immediate',
     'LinesOfALargeFile' => 'filesystem/linesofalargefile',
     'MFilterTestHelper' => 'utils/__tests__',
     'PhutilConsoleFormatter' => 'console',
     'PhutilConsoleStdinNotInteractiveException' => 'console/exception',
     'PhutilDaemon' => 'daemon/base',
     'PhutilDaemonOverseer' => 'daemon/overseer',
     'PhutilDefaultSyntaxHighlighter' => 'markup/syntax/highlighter/default',
     'PhutilDefaultSyntaxHighlighterEngine' => 'markup/syntax/engine/default',
     'PhutilDefaultSyntaxHighlighterEnginePygmentsFuture' => 'markup/syntax/highlighter/pygments/future',
     'PhutilDefaultSyntaxHighlighterEngineTestCase' => 'markup/syntax/engine/default/__tests__',
     'PhutilDivinerSyntaxHighlighter' => 'markup/syntax/highlighter/diviner',
     'PhutilDocblockParser' => 'parser/docblock',
     'PhutilDocblockParserTestCase' => 'parser/docblock/__tests__',
     'PhutilErrorHandler' => 'error',
     'PhutilExcessiveServiceCallsDaemon' => 'daemon/torture/excessiveservicecalls',
     'PhutilFatalDaemon' => 'daemon/torture/fatal',
     'PhutilHangForeverDaemon' => 'daemon/torture/hangforever',
     'PhutilInteractiveEditor' => 'console/editor',
     'PhutilJSON' => 'parser/json',
     'PhutilMarkupEngine' => 'markup/engine',
     'PhutilMissingSymbolException' => 'symbols/exception/missing',
     'PhutilNiceDaemon' => 'daemon/torture/nice',
     'PhutilProcessGroupDaemon' => 'daemon/torture/processgroup',
     'PhutilPygmentsSyntaxHighlighter' => 'markup/syntax/highlighter/pygments',
     'PhutilRainbowSyntaxHighlighter' => 'markup/syntax/highlighter/rainbow',
     'PhutilReadableSerializer' => 'readableserializer',
     'PhutilRemarkupBlockStorage' => 'markup/engine/remarkup/blockstorage',
     'PhutilRemarkupEngine' => 'markup/engine/remarkup',
     'PhutilRemarkupEngineBlockRule' => 'markup/engine/remarkup/blockrule/base',
     'PhutilRemarkupEngineRemarkupCodeBlockRule' => 'markup/engine/remarkup/blockrule/remarkupcode',
     'PhutilRemarkupEngineRemarkupDefaultBlockRule' => 'markup/engine/remarkup/blockrule/remarkupdefault',
     'PhutilRemarkupEngineRemarkupHeaderBlockRule' => 'markup/engine/remarkup/blockrule/remarkupheader',
     'PhutilRemarkupEngineRemarkupInlineBlockRule' => 'markup/engine/remarkup/blockrule/remarkupinline',
     'PhutilRemarkupEngineRemarkupListBlockRule' => 'markup/engine/remarkup/blockrule/remarkuplist',
     'PhutilRemarkupEngineRemarkupNoteBlockRule' => 'markup/engine/remarkup/blockrule/remarkupnote',
     'PhutilRemarkupEngineRemarkupQuotesBlockRule' => 'markup/engine/remarkup/blockrule/remarkupquotes',
     'PhutilRemarkupEngineTestCase' => 'markup/engine/remarkup/__tests__',
     'PhutilRemarkupRule' => 'markup/engine/remarkup/markuprule/base',
     'PhutilRemarkupRuleBold' => 'markup/engine/remarkup/markuprule/bold',
     'PhutilRemarkupRuleEscapeHTML' => 'markup/engine/remarkup/markuprule/escapehtml',
     'PhutilRemarkupRuleEscapeRemarkup' => 'markup/engine/remarkup/markuprule/escaperemarkup',
     'PhutilRemarkupRuleHyperlink' => 'markup/engine/remarkup/markuprule/hyperlink',
     'PhutilRemarkupRuleItalic' => 'markup/engine/remarkup/markuprule/italics',
     'PhutilRemarkupRuleLinebreaks' => 'markup/engine/remarkup/markuprule/linebreaks',
     'PhutilRemarkupRuleMonospace' => 'markup/engine/remarkup/markuprule/monospace',
     'PhutilSaturateStdoutDaemon' => 'daemon/torture/saturatestdout',
     'PhutilServiceProfiler' => 'serviceprofiler',
     'PhutilSymbolLoader' => 'symbols',
     'PhutilSyntaxHighlighter' => 'markup/syntax/highlighter/base',
     'PhutilSyntaxHighlighterEngine' => 'markup/syntax/engine/base',
     'PhutilTortureTestDaemon' => 'daemon/torture/base',
     'PhutilURI' => 'parser/uri',
+    'PhutilURITestCase' => 'parser/uri/__tests__',
     'PhutilUTF8TestCase' => 'utils/__tests__',
     'PhutilUtilsTestCase' => 'utils/__tests__',
     'PhutilXHPASTSyntaxHighlighter' => 'markup/syntax/highlighter/xhpast',
     'TempFile' => 'filesystem/tempfile',
     'TestAbstractDirectedGraph' => 'utils/abstractgraph/__tests__',
     'XHPASTNode' => 'parser/xhpast/api/node',
     'XHPASTNodeList' => 'parser/xhpast/api/list',
     'XHPASTSyntaxErrorException' => 'parser/xhpast/api/exception',
     'XHPASTToken' => 'parser/xhpast/api/token',
     'XHPASTTree' => 'parser/xhpast/api/tree',
     'XHPASTTreeTestCase' => 'parser/xhpast/api/tree/__tests__',
   ),
   'function' =>
   array(
     'Futures' => 'future',
     'array_mergev' => 'utils',
     'array_select_keys' => 'utils',
     'coalesce' => 'utils',
     'csprintf' => 'xsprintf/csprintf',
     'exec_manual' => 'future/exec',
     'execx' => 'future/exec',
     'head' => 'utils',
     'id' => 'utils',
     'idx' => 'utils',
     'ifilter' => 'utils',
     'igroup' => 'utils',
     'ipull' => 'utils',
     'isort' => 'utils',
     'jsprintf' => 'xsprintf/jsprintf',
     'mfilter' => 'utils',
     'mgroup' => 'utils',
     'mpull' => 'utils',
     'msort' => 'utils',
     'newv' => 'utils',
     'nonempty' => 'utils',
     'phlog' => 'error',
     'phutil_console_confirm' => 'console',
     'phutil_console_format' => 'console',
     'phutil_console_prompt' => 'console',
     'phutil_console_require_tty' => 'console',
     'phutil_console_wrap' => 'console',
     'phutil_deprecated' => 'moduleutils',
     'phutil_error_listener_example' => 'error',
     'phutil_escape_html' => 'markup',
     'phutil_escape_uri' => 'markup',
     'phutil_get_library_name_for_root' => 'moduleutils',
     'phutil_get_library_root' => 'moduleutils',
     'phutil_get_library_root_for_path' => 'moduleutils',
     'phutil_is_utf8' => 'utils',
     'phutil_passthru' => 'future/exec',
     'phutil_render_tag' => 'markup',
     'phutil_utf8_shorten' => 'utils',
     'phutil_utf8_strlen' => 'utils',
     'phutil_utf8ize' => 'utils',
     'phutil_utf8v' => 'utils',
     'vcsprintf' => 'xsprintf/csprintf',
     'vjsprintf' => 'xsprintf/jsprintf',
     'xhp_parser_node_constants' => 'parser/xhpast/constants',
     'xhpast_get_binary_path' => 'parser/xhpast/bin',
     'xhpast_get_build_instructions' => 'parser/xhpast/bin',
     'xhpast_get_parser_future' => 'parser/xhpast/bin',
     'xhpast_is_available' => 'parser/xhpast/bin',
     'xhpast_parser_token_constants' => 'parser/xhpast/constants',
     'xsprintf' => 'xsprintf',
     'xsprintf_callback_example' => 'xsprintf',
     'xsprintf_command' => 'xsprintf/csprintf',
     'xsprintf_javascript' => 'xsprintf/jsprintf',
   ),
   'requires_class' =>
   array(
     'AbstractDirectedGraphTestCase' => 'ArcanistPhutilTestCase',
     'BaseHTTPFuture' => 'Future',
     'ConduitFuture' => 'FutureProxy',
     'ExecFuture' => 'Future',
     'FutureProxy' => 'Future',
     'HTTPFuture' => 'BaseHTTPFuture',
     'HTTPFutureResponseStatusCURL' => 'HTTPFutureResponseStatus',
     'HTTPFutureResponseStatusHTTP' => 'HTTPFutureResponseStatus',
     'HTTPFutureResponseStatusParse' => 'HTTPFutureResponseStatus',
     'HTTPFutureResponseStatusTransport' => 'HTTPFutureResponseStatus',
     'HTTPSFuture' => 'BaseHTTPFuture',
     'ImmediateFuture' => 'Future',
     'PhutilDefaultSyntaxHighlighterEngine' => 'PhutilSyntaxHighlighterEngine',
     'PhutilDefaultSyntaxHighlighterEnginePygmentsFuture' => 'FutureProxy',
     'PhutilDefaultSyntaxHighlighterEngineTestCase' => 'ArcanistPhutilTestCase',
     'PhutilDocblockParserTestCase' => 'ArcanistPhutilTestCase',
     'PhutilExcessiveServiceCallsDaemon' => 'PhutilTortureTestDaemon',
     'PhutilFatalDaemon' => 'PhutilTortureTestDaemon',
     'PhutilHangForeverDaemon' => 'PhutilTortureTestDaemon',
     'PhutilNiceDaemon' => 'PhutilTortureTestDaemon',
     'PhutilProcessGroupDaemon' => 'PhutilTortureTestDaemon',
     'PhutilRemarkupEngine' => 'PhutilMarkupEngine',
     'PhutilRemarkupEngineRemarkupCodeBlockRule' => 'PhutilRemarkupEngineBlockRule',
     'PhutilRemarkupEngineRemarkupDefaultBlockRule' => 'PhutilRemarkupEngineBlockRule',
     'PhutilRemarkupEngineRemarkupHeaderBlockRule' => 'PhutilRemarkupEngineBlockRule',
     'PhutilRemarkupEngineRemarkupInlineBlockRule' => 'PhutilRemarkupEngineBlockRule',
     'PhutilRemarkupEngineRemarkupListBlockRule' => 'PhutilRemarkupEngineBlockRule',
     'PhutilRemarkupEngineRemarkupNoteBlockRule' => 'PhutilRemarkupEngineBlockRule',
     'PhutilRemarkupEngineRemarkupQuotesBlockRule' => 'PhutilRemarkupEngineBlockRule',
     'PhutilRemarkupEngineTestCase' => 'ArcanistPhutilTestCase',
     'PhutilRemarkupRuleBold' => 'PhutilRemarkupRule',
     'PhutilRemarkupRuleEscapeHTML' => 'PhutilRemarkupRule',
     'PhutilRemarkupRuleEscapeRemarkup' => 'PhutilRemarkupRule',
     'PhutilRemarkupRuleHyperlink' => 'PhutilRemarkupRule',
     'PhutilRemarkupRuleItalic' => 'PhutilRemarkupRule',
     'PhutilRemarkupRuleLinebreaks' => 'PhutilRemarkupRule',
     'PhutilRemarkupRuleMonospace' => 'PhutilRemarkupRule',
     'PhutilSaturateStdoutDaemon' => 'PhutilTortureTestDaemon',
     'PhutilTortureTestDaemon' => 'PhutilDaemon',
+    'PhutilURITestCase' => 'ArcanistPhutilTestCase',
     'PhutilUTF8TestCase' => 'ArcanistPhutilTestCase',
     'PhutilUtilsTestCase' => 'ArcanistPhutilTestCase',
     'TestAbstractDirectedGraph' => 'AbstractDirectedGraph',
     'XHPASTTreeTestCase' => 'ArcanistPhutilTestCase',
   ),
   'requires_interface' =>
   array(
   ),
 ));
diff --git a/src/parser/uri/PhutilURI.php b/src/parser/uri/PhutilURI.php
index bd64ddce..a50fe667 100644
--- a/src/parser/uri/PhutilURI.php
+++ b/src/parser/uri/PhutilURI.php
@@ -1,158 +1,190 @@
 <?php
 
 /*
  * Copyright 2011 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 /**
  * Basic URI parser object.
  *
  * @group util
  */
 final class PhutilURI {
 
   private $protocol;
+  private $user;
+  private $pass;
   private $domain;
   private $port;
   private $path;
   private $query = array();
   private $fragment;
 
   public function __construct($uri) {
     $parts = $this->parseURI($uri);
     if ($parts) {
       $this->protocol = $parts[1];
-      $this->domain   = $parts[2];
-      $this->port     = $parts[3];
-      $this->path     = $parts[4];
-      parse_str($parts[5], $this->query);
-      $this->fragment = $parts[6];
+      $this->user     = $parts[2];
+      $this->pass     = $parts[3];
+      $this->domain   = $parts[4];
+      $this->port     = $parts[5];
+      $this->path     = $parts[6];
+      parse_str($parts[7], $this->query);
+      $this->fragment = $parts[8];
     }
   }
 
   private static function parseURI($uri) {
     // NOTE: We allow "+" in the protocol for "svn+ssh" and similar.
     $protocol = '([\w+]+):\/\/';
+    $auth     = '(?:([^:@]+)(?::([^@]+))?@)?';
     $domain   = '([a-zA-Z0-9\.\-_]*)';
     $port     = '(?::(\d+))?';
     $path     = '((?:\/|^)[^#?]*)?';
     $query    = '(?:\?([^#]*))?';
     $anchor   = '(?:#(.*))?';
 
-    $regexp = '/^(?:'.$protocol.$domain.$port.')?'.$path.$query.$anchor.'$/S';
+    $regexp = '/^(?:'.$protocol.$auth.$domain.$port.')?'.
+              $path.$query.$anchor.'$/S';
 
     $matches = null;
     $ok = preg_match($regexp, $uri, $matches);
     if ($ok) {
-      return array_pad($matches, 7, null);
+      return array_pad($matches, 9, '');
     }
 
     return null;
   }
 
   public function __toString() {
     $prefix = null;
     if ($this->protocol || $this->domain || $this->port) {
       $protocol = nonempty($this->protocol, 'http');
-      $prefix = $protocol.'://'.$this->domain;
+
+      $auth = '';
+      if ($this->user && $this->pass) {
+        $auth = $this->user.':'.$this->pass.'@';
+      } else if ($this->user) {
+        $auth = $this->user.'@';
+      }
+
+      $prefix = $protocol.'://'.$auth.$this->domain;
       if ($this->port) {
         $prefix .= ':'.$this->port;
       }
     }
 
     if ($this->query) {
       $query = '?'.http_build_query($this->query);
     } else {
       $query = null;
     }
 
     if (strlen($this->getFragment())) {
       $fragment = '#'.$this->getFragment();
     } else {
       $fragment = null;
     }
 
     return $prefix.$this->getPath().$query.$fragment;
   }
 
   public function setQueryParam($key, $value) {
     if ($value === null) {
       unset($this->query[$key]);
     } else {
       $this->query[$key] = $value;
     }
     return $this;
   }
 
   public function setQueryParams(array $params) {
     $this->query = $params;
     return $this;
   }
 
   public function getQueryParams() {
     return $this->query;
   }
 
   public function setProtocol($protocol) {
     $this->protocol = $protocol;
     return $this;
   }
   public function getProtocol() {
     return $this->protocol;
   }
 
   public function setDomain($domain) {
     $this->domain = $domain;
     return $this;
   }
 
   public function getDomain() {
     return $this->domain;
   }
 
   public function setPort($port) {
     $this->port = $port;
     return $this;
   }
   public function getPort() {
     return $this->port;
   }
 
   public function setPath($path) {
     $this->path = $path;
     return $this;
   }
 
   public function getPath() {
     return $this->path;
   }
 
   public function setFragment($fragment) {
     $this->fragment = $fragment;
     return $this;
   }
 
   public function getFragment() {
     return $this->fragment;
   }
 
+  public function setUser($user) {
+    $this->user = $user;
+    return $this;
+  }
+
+  public function getUser() {
+    return $this->user;
+  }
+
+  public function setPass($pass) {
+    $this->pass = $pass;
+    return $this;
+  }
+
+  public function getPass() {
+    return $this->pass;
+  }
+
   public function alter($key, $value) {
     $altered = clone $this;
     $altered->setQueryParam($key, $value);
     return $altered;
   }
 
 }
 
diff --git a/src/parser/uri/__tests__/PhutilURITestCase.php b/src/parser/uri/__tests__/PhutilURITestCase.php
new file mode 100644
index 00000000..46e18149
--- /dev/null
+++ b/src/parser/uri/__tests__/PhutilURITestCase.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Test cases for @{class:PhutilDocblockParser}.
+ *
+ * @group testcase
+ */
+final class PhutilURITestCase extends ArcanistPhutilTestCase {
+
+  public function testURIParsing() {
+    $uri = new PhutilURI('http://user:pass@host:99/path/?query=value#fragment');
+    $this->assertEqual('http', $uri->getProtocol(), 'protocol');
+    $this->assertEqual('user', $uri->getUser(), 'user');
+    $this->assertEqual('pass', $uri->getPass(), 'pass');
+    $this->assertEqual('host', $uri->getDomain(), 'domain');
+    $this->assertEqual('99', $uri->getPort(), 'port');
+
+    $this->assertEqual('/path/', $uri->getPath(), 'path');
+    $this->assertEqual(
+      array(
+        'query' => 'value',
+      ),
+      $uri->getQueryParams(),
+      'query params');
+    $this->assertEqual('fragment', $uri->getFragment(), 'fragment');
+    $this->assertEqual(
+      'http://user:pass@host:99/path/?query=value#fragment',
+      (string)$uri,
+      'uri');
+
+
+    $uri = new PhutilURI('ssh://git@example.com/example/example.git');
+    $this->assertEqual('ssh', $uri->getProtocol(), 'protocol');
+    $this->assertEqual('git', $uri->getUser(), 'user');
+    $this->assertEqual('', $uri->getPass(), 'pass');
+    $this->assertEqual('example.com', $uri->getDomain(), 'domain');
+    $this->assertEqual('', $uri->getPort(), 'port');
+
+    $this->assertEqual('/example/example.git', $uri->getPath(), 'path');
+    $this->assertEqual(array(), $uri->getQueryParams(), 'query params');
+    $this->assertEqual('', $uri->getFragment(), 'fragment');
+    $this->assertEqual(
+      'ssh://git@example.com/example/example.git',
+      (string)$uri,
+      'uri');
+
+  }
+
+
+}
diff --git a/src/parser/uri/__tests__/__init__.php b/src/parser/uri/__tests__/__init__.php
new file mode 100644
index 00000000..a29274ac
--- /dev/null
+++ b/src/parser/uri/__tests__/__init__.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('arcanist', 'unit/engine/phutil/testcase');
+
+phutil_require_module('phutil', 'parser/uri');
+
+
+phutil_require_source('PhutilURITestCase.php');