diff --git a/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php b/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php
index 3b16aa3c8..75975104e 100644
--- a/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php
+++ b/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php
@@ -1,291 +1,298 @@
 <?php
 
 /*
  * Copyright 2012 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.
  */
 
 class DifferentialChangesetViewController extends DifferentialController {
 
 
   public function shouldRequireLogin() {
     return !$this->allowsAnonymousAccess();
   }
 
   public function processRequest() {
     $request = $this->getRequest();
 
     $author_phid = $request->getUser()->getPHID();
 
     $rendering_reference = $request->getStr('ref');
     $parts = explode('/', $rendering_reference);
     if (count($parts) == 2) {
       list($id, $vs) = $parts;
     } else {
       $id = $parts[0];
       $vs = 0;
     }
 
     $id = (int)$id;
     $vs = (int)$vs;
 
     $changeset = id(new DifferentialChangeset())->load($id);
     if (!$changeset) {
       return new Aphront404Response();
     }
 
     $view = $request->getStr('view');
     if ($view) {
       $changeset->attachHunks($changeset->loadHunks());
-      switch ($view) {
-        case 'new':
-          return $this->buildRawFileResponse($changeset->makeNewFile());
-        case 'old':
-          return $this->buildRawFileResponse($changeset->makeOldFile());
-        default:
-          return new Aphront400Response();
+      $type = $changeset->getFileType();
+      if ($type === DifferentialChangeType::FILE_TEXT) {
+        switch ($view) {
+          case 'new':
+            return $this->buildRawFileResponse($changeset->makeNewFile());
+          case 'old':
+            return $this->buildRawFileResponse($changeset->makeOldFile());
+          default:
+            return new Aphront400Response();
+        }
+      } else if ($type === DifferentialChangeType::FILE_IMAGE ||
+                 $type === DifferentialChangeType::FILE_BINARY) {
+          $phid = idx($changeset->getMetadata(), "$view:binary-phid");
+          return id(new AphrontRedirectResponse())->setURI("/file/info/$phid/");
       }
     }
 
     if ($vs && ($vs != -1)) {
       $vs_changeset = id(new DifferentialChangeset())->load($vs);
       if (!$vs_changeset) {
         return new Aphront404Response();
       }
     }
 
     if (!$vs) {
       $right = $changeset;
       $left  = null;
 
       $right_source = $right->getID();
       $right_new = true;
       $left_source = $right->getID();
       $left_new = false;
 
       $render_cache_key = $right->getID();
     } else if ($vs == -1) {
       $right = null;
       $left = $changeset;
 
       $right_source = $left->getID();
       $right_new = false;
       $left_source = $left->getID();
       $left_new = true;
 
       $render_cache_key = null;
     } else {
       $right = $changeset;
       $left = $vs_changeset;
 
       $right_source = $right->getID();
       $right_new = true;
       $left_source = $left->getID();
       $left_new = true;
 
       $render_cache_key = null;
     }
 
     if ($left) {
       $left->attachHunks($left->loadHunks());
     }
 
     if ($right) {
       $right->attachHunks($right->loadHunks());
     }
 
     if ($left) {
 
       $left_data = $left->makeNewFile();
       if ($right) {
         $right_data = $right->makeNewFile();
       } else {
         $right_data = $left->makeOldFile();
       }
 
       $engine = new PhabricatorDifferenceEngine();
       $synthetic = $engine->generateChangesetFromFileContent(
         $left_data,
         $right_data);
 
       $choice = nonempty($left, $right);
       $choice->attachHunks($synthetic->getHunks());
 
       $changeset = $choice;
     }
 
     $coverage = null;
     if ($right->getDiffID()) {
       $unit = id(new DifferentialDiffProperty())->loadOneWhere(
         'diffID = %d AND name = %s',
         $right->getDiffID(),
         'arc:unit');
 
       if ($unit) {
         $coverage = array();
         foreach ($unit->getData() as $result) {
           $result_coverage = idx($result, 'coverage');
           if (!$result_coverage) {
             continue;
           }
           $file_coverage = idx($result_coverage, $right->getFileName());
           if (!$file_coverage) {
             continue;
           }
           $coverage[] = $file_coverage;
         }
 
         $coverage = ArcanistUnitTestResult::mergeCoverage($coverage);
       }
     }
 
     $spec = $request->getStr('range');
     list($range_s, $range_e, $mask) =
       DifferentialChangesetParser::parseRangeSpecification($spec);
 
     $parser = new DifferentialChangesetParser();
     $parser->setCoverage($coverage);
     $parser->setChangeset($changeset);
     $parser->setRenderingReference($rendering_reference);
     $parser->setRenderCacheKey($render_cache_key);
     $parser->setRightSideCommentMapping($right_source, $right_new);
     $parser->setLeftSideCommentMapping($left_source, $left_new);
     $parser->setWhitespaceMode($request->getStr('whitespace'));
 
     // Load both left-side and right-side inline comments.
     $inlines = $this->loadInlineComments(
       array($left_source, $right_source),
       $author_phid);
 
     if ($left_new) {
       $inlines = array_merge(
         $inlines,
         $this->buildLintInlineComments($left));
     }
 
     if ($right_new) {
       $inlines = array_merge(
         $inlines,
         $this->buildLintInlineComments($right));
     }
 
     $phids = array();
     foreach ($inlines as $inline) {
       $parser->parseInlineComment($inline);
       if ($inline->getAuthorPHID()) {
         $phids[$inline->getAuthorPHID()] = true;
       }
     }
     $phids = array_keys($phids);
 
     $handles = id(new PhabricatorObjectHandleData($phids))
       ->loadHandles();
     $parser->setHandles($handles);
 
     $engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();
     $parser->setMarkupEngine($engine);
 
     if ($request->isAjax()) {
       // TODO: This is sort of lazy, the effect is just to not render "Edit"
       // links on the "standalone view".
       $parser->setUser($request->getUser());
     }
 
     $output = $parser->render($range_s, $range_e, $mask);
 
     if ($request->isAjax()) {
       return id(new AphrontAjaxResponse())
         ->setContent($output);
     }
 
     Javelin::initBehavior('differential-show-more', array(
       'uri' => '/differential/changeset/',
       'whitespace' => $request->getStr('whitespace'),
     ));
 
     Javelin::initBehavior('differential-comment-jump', array());
 
     $detail = new DifferentialChangesetDetailView();
     $detail->setChangeset($changeset);
     $detail->appendChild($output);
 
     $detail->setRevisionID($request->getInt('revision_id'));
 
     $output =
       id(new DifferentialPrimaryPaneView())
         ->setLineWidthFromChangesets(array($changeset))
         ->appendChild(
           '<div class="differential-review-stage" '.
             'id="differential-review-stage">'.
             $detail->render().
           '</div>');
 
     return $this->buildStandardPageResponse(
       array(
         $output
       ),
       array(
         'title' => 'Changeset View',
       ));
   }
 
   private function loadInlineComments(array $changeset_ids, $author_phid) {
     $changeset_ids = array_unique(array_filter($changeset_ids));
     if (!$changeset_ids) {
       return;
     }
 
     return id(new DifferentialInlineComment())->loadAllWhere(
       'changesetID IN (%Ld) AND (commentID IS NOT NULL OR authorPHID = %s)',
       $changeset_ids,
       $author_phid);
   }
 
   private function buildRawFileResponse($text) {
     return id(new AphrontFileResponse())
       ->setMimeType('text/plain')
       ->setContent($text);
   }
 
   private function buildLintInlineComments($changeset) {
     $lint = id(new DifferentialDiffProperty())->loadOneWhere(
       'diffID = %d AND name = %s',
       $changeset->getDiffID(),
       'arc:lint');
     if (!$lint) {
       return array();
     }
     $lint = $lint->getData();
 
     $inlines = array();
     foreach ($lint as $msg) {
       if ($msg['path'] != $changeset->getFilename()) {
         continue;
       }
       $inline = new DifferentialInlineComment();
       $inline->setChangesetID($changeset->getID());
       $inline->setIsNewFile(true);
       $inline->setSyntheticAuthor('Lint: '.$msg['name']);
       $inline->setLineNumber($msg['line']);
       $inline->setLineLength(0);
 
       $inline->setContent('%%%'.$msg['description'].'%%%');
 
       $inlines[] = $inline;
     }
 
     return $inlines;
   }
 
 }
diff --git a/src/applications/differential/controller/changesetview/__init__.php b/src/applications/differential/controller/changesetview/__init__.php
index f7457700a..dd03e94ee 100644
--- a/src/applications/differential/controller/changesetview/__init__.php
+++ b/src/applications/differential/controller/changesetview/__init__.php
@@ -1,30 +1,32 @@
 <?php
 /**
  * This file is automatically generated. Lint this module to rebuild it.
  * @generated
  */
 
 
 
 phutil_require_module('arcanist', 'unit/result');
 
 phutil_require_module('phabricator', 'aphront/response/400');
 phutil_require_module('phabricator', 'aphront/response/404');
 phutil_require_module('phabricator', 'aphront/response/ajax');
 phutil_require_module('phabricator', 'aphront/response/file');
+phutil_require_module('phabricator', 'aphront/response/redirect');
+phutil_require_module('phabricator', 'applications/differential/constants/changetype');
 phutil_require_module('phabricator', 'applications/differential/controller/base');
 phutil_require_module('phabricator', 'applications/differential/parser/changeset');
 phutil_require_module('phabricator', 'applications/differential/storage/changeset');
 phutil_require_module('phabricator', 'applications/differential/storage/diffproperty');
 phutil_require_module('phabricator', 'applications/differential/storage/inlinecomment');
 phutil_require_module('phabricator', 'applications/differential/view/changesetdetailview');
 phutil_require_module('phabricator', 'applications/differential/view/primarypane');
 phutil_require_module('phabricator', 'applications/markup/engine');
 phutil_require_module('phabricator', 'applications/phid/handle/data');
 phutil_require_module('phabricator', 'infrastructure/diff/engine');
 phutil_require_module('phabricator', 'infrastructure/javelin/api');
 
 phutil_require_module('phutil', 'utils');
 
 
 phutil_require_source('DifferentialChangesetViewController.php');