diff --git a/src/applications/auth/provider/PhabricatorJIRAAuthProvider.php b/src/applications/auth/provider/PhabricatorJIRAAuthProvider.php
index c81cbe64aa..8bbbedc3c6 100644
--- a/src/applications/auth/provider/PhabricatorJIRAAuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorJIRAAuthProvider.php
@@ -1,289 +1,335 @@
 <?php
 
 final class PhabricatorJIRAAuthProvider extends PhabricatorOAuth1AuthProvider {
 
   public function getJIRABaseURI() {
     return $this->getProviderConfig()->getProperty(self::PROPERTY_JIRA_URI);
   }
 
   public function getProviderName() {
     return pht('JIRA');
   }
 
   public function getDescriptionForCreate() {
     return pht('Configure JIRA OAuth. NOTE: Only supports JIRA 6.');
   }
 
   public function getConfigurationHelp() {
     return $this->getProviderConfigurationHelp();
   }
 
   protected function getProviderConfigurationHelp() {
     if ($this->isSetup()) {
       return pht(
         "**Step 1 of 2**: Provide the name and URI for your JIRA install.\n\n".
         "In the next step, you will configure JIRA.");
     } else {
       $login_uri = PhabricatorEnv::getURI($this->getLoginURI());
       return pht(
         "**Step 2 of 2**: In this step, you will configure JIRA.\n\n".
         "**Create a JIRA Application**: Log into JIRA and go to ".
         "**Administration**, then **Add-ons**, then **Application Links**. ".
         "Click the button labeled **Add Application Link**, and use these ".
         "settings to create an application:\n\n".
         "  - **Server URL**: `%s`\n".
         "  - Then, click **Next**. On the second page:\n".
         "  - **Application Name**: `Phabricator`\n".
         "  - **Application Type**: `Generic Application`\n".
         "  - Then, click **Create**.\n\n".
         "**Configure Your Application**: Find the application you just ".
         "created in the table, and click the **Configure** link under ".
         "**Actions**. Select **Incoming Authentication** and click the ".
         "**OAuth** tab (it may be selected by default). Then, use these ".
         "settings:\n\n".
         "  - **Consumer Key**: Set this to the \"Consumer Key\" value in the ".
         "form above.\n".
         "  - **Consumer Name**: `Phabricator`\n".
         "  - **Public Key**: Set this to the \"Public Key\" value in the ".
         "form above.\n".
         "  - **Consumer Callback URL**: `%s`\n".
         "Click **Save** in JIRA. Authentication should now be configured, ".
         "and this provider should work correctly.",
         PhabricatorEnv::getProductionURI('/'),
         $login_uri);
     }
   }
 
   protected function newOAuthAdapter() {
     $config = $this->getProviderConfig();
 
     return id(new PhutilJIRAAuthAdapter())
       ->setAdapterDomain($config->getProviderDomain())
       ->setJIRABaseURI($config->getProperty(self::PROPERTY_JIRA_URI))
       ->setPrivateKey(
         new PhutilOpaqueEnvelope(
           $config->getProperty(self::PROPERTY_PRIVATE_KEY)));
   }
 
   protected function getLoginIcon() {
     return 'Jira';
   }
 
   private function isSetup() {
     return !$this->getProviderConfig()->getID();
   }
 
   const PROPERTY_JIRA_NAME = 'oauth1:jira:name';
   const PROPERTY_JIRA_URI = 'oauth1:jira:uri';
   const PROPERTY_PUBLIC_KEY = 'oauth1:jira:key:public';
   const PROPERTY_PRIVATE_KEY = 'oauth1:jira:key:private';
+  const PROPERTY_REPORT_LINK = 'oauth1:jira:report:link';
+  const PROPERTY_REPORT_COMMENT = 'oauth1:jira:report:comment';
 
 
   public function readFormValuesFromProvider() {
     $config = $this->getProviderConfig();
     $uri = $config->getProperty(self::PROPERTY_JIRA_URI);
 
     return array(
       self::PROPERTY_JIRA_NAME => $this->getProviderDomain(),
       self::PROPERTY_JIRA_URI => $uri,
     );
   }
 
   public function readFormValuesFromRequest(AphrontRequest $request) {
     $is_setup = $this->isSetup();
     if ($is_setup) {
       $name = $request->getStr(self::PROPERTY_JIRA_NAME);
     } else {
       $name = $this->getProviderDomain();
     }
 
     return array(
       self::PROPERTY_JIRA_NAME => $name,
       self::PROPERTY_JIRA_URI => $request->getStr(self::PROPERTY_JIRA_URI),
+      self::PROPERTY_REPORT_LINK =>
+        $request->getInt(self::PROPERTY_REPORT_LINK, 0),
+      self::PROPERTY_REPORT_COMMENT =>
+        $request->getInt(self::PROPERTY_REPORT_COMMENT, 0),
     );
   }
 
   public function processEditForm(
     AphrontRequest $request,
     array $values) {
     $errors = array();
     $issues = array();
 
     $is_setup = $this->isSetup();
 
     $key_name = self::PROPERTY_JIRA_NAME;
     $key_uri = self::PROPERTY_JIRA_URI;
 
     if (!strlen($values[$key_name])) {
       $errors[] = pht('JIRA instance name is required.');
       $issues[$key_name] = pht('Required');
     } else if (!preg_match('/^[a-z0-9.]+\z/', $values[$key_name])) {
       $errors[] = pht(
         'JIRA instance name must contain only lowercase letters, digits, and '.
         'period.');
       $issues[$key_name] = pht('Invalid');
     }
 
     if (!strlen($values[$key_uri])) {
       $errors[] = pht('JIRA base URI is required.');
       $issues[$key_uri] = pht('Required');
     } else {
       $uri = new PhutilURI($values[$key_uri]);
       if (!$uri->getProtocol()) {
         $errors[] = pht(
           'JIRA base URI should include protocol (like "https://").');
         $issues[$key_uri] = pht('Invalid');
       }
     }
 
     if (!$errors && $is_setup) {
       $config = $this->getProviderConfig();
 
       $config->setProviderDomain($values[$key_name]);
 
       $consumer_key = 'phjira.'.Filesystem::readRandomCharacters(16);
       list($public, $private) = PhutilJIRAAuthAdapter::newJIRAKeypair();
 
       $config->setProperty(self::PROPERTY_PUBLIC_KEY, $public);
       $config->setProperty(self::PROPERTY_PRIVATE_KEY, $private);
       $config->setProperty(self::PROPERTY_CONSUMER_KEY, $consumer_key);
     }
 
     return array($errors, $issues, $values);
   }
 
   public function extendEditForm(
     AphrontRequest $request,
     AphrontFormView $form,
     array $values,
     array $issues) {
 
     if (!function_exists('openssl_pkey_new')) {
       // TODO: This could be a bit prettier.
       throw new Exception(
         pht(
           "The PHP 'openssl' extension is not installed. You must install ".
           "this extension in order to add a JIRA authentication provider, ".
           "because JIRA OAuth requests use the RSA-SHA1 signing algorithm. ".
           "Install the 'openssl' extension, restart your webserver, and try ".
           "again."));
     }
 
     $form->appendRemarkupInstructions(
       pht(
         'NOTE: This provider **only supports JIRA 6**. It will not work with '.
         'JIRA 5 or earlier.'));
 
     $is_setup = $this->isSetup();
+    $viewer = $request->getViewer();
 
     $e_required = $request->isFormPost() ? null : true;
 
     $v_name = $values[self::PROPERTY_JIRA_NAME];
     if ($is_setup) {
       $e_name = idx($issues, self::PROPERTY_JIRA_NAME, $e_required);
     } else {
       $e_name = null;
     }
 
     $v_uri = $values[self::PROPERTY_JIRA_URI];
     $e_uri = idx($issues, self::PROPERTY_JIRA_URI, $e_required);
 
     if ($is_setup) {
       $form
         ->appendRemarkupInstructions(
           pht(
             "**JIRA Instance Name**\n\n".
             "Choose a permanent name for this instance of JIRA. Phabricator ".
             "uses this name internally to keep track of this instance of ".
             "JIRA, in case the URL changes later.\n\n".
             "Use lowercase letters, digits, and period. For example, ".
             "`jira`, `jira.mycompany` or `jira.engineering` are reasonable ".
             "names."))
         ->appendChild(
           id(new AphrontFormTextControl())
             ->setLabel(pht('JIRA Instance Name'))
             ->setValue($v_name)
             ->setName(self::PROPERTY_JIRA_NAME)
             ->setError($e_name));
     } else {
       $form
         ->appendChild(
           id(new AphrontFormStaticControl())
             ->setLabel(pht('JIRA Instance Name'))
             ->setValue($v_name));
     }
 
     $form
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('JIRA Base URI'))
           ->setValue($v_uri)
           ->setName(self::PROPERTY_JIRA_URI)
           ->setCaption(
             pht(
               'The URI where JIRA is installed. For example: %s',
               phutil_tag('tt', array(), 'https://jira.mycompany.com/')))
           ->setError($e_uri));
 
     if (!$is_setup) {
       $config = $this->getProviderConfig();
 
 
       $ckey = $config->getProperty(self::PROPERTY_CONSUMER_KEY);
       $ckey = phutil_tag('tt', array(), $ckey);
 
       $pkey = $config->getProperty(self::PROPERTY_PUBLIC_KEY);
       $pkey = phutil_escape_html_newlines($pkey);
       $pkey = phutil_tag('tt', array(), $pkey);
 
       $form
         ->appendRemarkupInstructions(
           pht(
             'NOTE: **To complete setup**, copy and paste these keys into JIRA '.
             'according to the instructions below.'))
         ->appendChild(
           id(new AphrontFormStaticControl())
             ->setLabel(pht('Consumer Key'))
             ->setValue($ckey))
         ->appendChild(
           id(new AphrontFormStaticControl())
             ->setLabel(pht('Public Key'))
             ->setValue($pkey));
+
+      $form
+        ->appendRemarkupInstructions(
+          pht(
+            '= Integration Options = '."\n".
+            'Configure how to record Revisions on JIRA tasks.'."\n\n".
+            'Note you\'ll have to restart the daemons for this to take '.
+            'effect.'))
+        ->appendChild(
+          id(new AphrontFormCheckboxControl())
+            ->addCheckbox(
+              self::PROPERTY_REPORT_LINK,
+              1,
+              new PHUIRemarkupView(
+                $viewer,
+                pht(
+                  'Create **Issue Link** to the Revision, as an "implemented '.
+                  'in" relationship.')),
+              $this->shouldCreateJIRALink()))
+        ->appendChild(
+          id(new AphrontFormCheckboxControl())
+            ->addCheckbox(
+              self::PROPERTY_REPORT_COMMENT,
+              1,
+              new PHUIRemarkupView(
+                $viewer,
+                pht(
+                  '**Post a comment** in the JIRA task, similar to the '.
+                  'emails Phabricator sends.')),
+              $this->shouldCreateJIRAComment()));
     }
 
   }
 
-
   /**
    * JIRA uses a setup step to generate public/private keys.
    */
   public function hasSetupStep() {
     return true;
   }
 
   public static function getJIRAProvider() {
     $providers = self::getAllEnabledProviders();
 
     foreach ($providers as $provider) {
       if ($provider instanceof PhabricatorJIRAAuthProvider) {
         return $provider;
       }
     }
 
     return null;
   }
 
   public function newJIRAFuture(
     PhabricatorExternalAccount $account,
     $path,
     $method,
     $params = array()) {
 
     $adapter = clone $this->getAdapter();
     $adapter->setToken($account->getProperty('oauth1.token'));
     $adapter->setTokenSecret($account->getProperty('oauth1.token.secret'));
 
     return $adapter->newJIRAFuture($path, $method, $params);
   }
 
+  public function shouldCreateJIRALink() {
+    $config = $this->getProviderConfig();
+    return $config->getProperty(self::PROPERTY_REPORT_LINK, true);
+  }
+
+  public function shouldCreateJIRAComment() {
+    $config = $this->getProviderConfig();
+    return $config->getProperty(self::PROPERTY_REPORT_COMMENT, true);
+  }
+
 }
diff --git a/src/applications/doorkeeper/worker/DoorkeeperJIRAFeedWorker.php b/src/applications/doorkeeper/worker/DoorkeeperJIRAFeedWorker.php
index 7c6f15cf04..24631ed1b3 100644
--- a/src/applications/doorkeeper/worker/DoorkeeperJIRAFeedWorker.php
+++ b/src/applications/doorkeeper/worker/DoorkeeperJIRAFeedWorker.php
@@ -1,182 +1,248 @@
 <?php
 
 /**
  * Publishes feed stories into JIRA, using the "JIRA Issues" field to identify
  * linked issues.
  */
 final class DoorkeeperJIRAFeedWorker extends DoorkeeperFeedWorker {
 
   private $provider;
 
 
 /* -(  Publishing Stories  )------------------------------------------------- */
 
 
   /**
    * This worker is enabled when a JIRA authentication provider is active.
    */
   public function isEnabled() {
     return (bool)PhabricatorJIRAAuthProvider::getJIRAProvider();
   }
 
 
   /**
    * Publishes stories into JIRA using the JIRA API.
    */
   protected function publishFeedStory() {
     $story = $this->getFeedStory();
     $viewer = $this->getViewer();
     $provider = $this->getProvider();
     $object = $this->getStoryObject();
     $publisher = $this->getPublisher();
 
     $jira_issue_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
       $object->getPHID(),
       PhabricatorJiraIssueHasObjectEdgeType::EDGECONST);
     if (!$jira_issue_phids) {
       $this->log(
         "%s\n",
         pht('Story is about an object with no linked JIRA issues.'));
       return;
     }
 
+    $do_anything = ($this->shouldPostComment() || $this->shouldPostLink());
+    if (!$do_anything) {
+      $this->log(
+        "%s\n",
+        pht('JIRA integration is configured not to post anything.'));
+      return;
+    }
+
     $xobjs = id(new DoorkeeperExternalObjectQuery())
       ->setViewer($viewer)
       ->withPHIDs($jira_issue_phids)
       ->execute();
 
     if (!$xobjs) {
       $this->log(
         "%s\n",
         pht('Story object has no corresponding external JIRA objects.'));
       return;
     }
 
     $try_users = $this->findUsersToPossess();
     if (!$try_users) {
       $this->log(
         "%s\n",
         pht('No users to act on linked JIRA objects.'));
       return;
     }
 
-    $story_text = $this->renderStoryText();
 
     $xobjs = mgroup($xobjs, 'getApplicationDomain');
     foreach ($xobjs as $domain => $xobj_list) {
       $accounts = id(new PhabricatorExternalAccountQuery())
         ->setViewer($viewer)
         ->withUserPHIDs($try_users)
         ->withAccountTypes(array($provider->getProviderType()))
         ->withAccountDomains(array($domain))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->execute();
       // Reorder accounts in the original order.
       // TODO: This needs to be adjusted if/when we allow you to link multiple
       // accounts.
       $accounts = mpull($accounts, null, 'getUserPHID');
       $accounts = array_select_keys($accounts, $try_users);
 
       foreach ($xobj_list as $xobj) {
         foreach ($accounts as $account) {
           try {
-            $provider->newJIRAFuture(
-              $account,
-              'rest/api/2/issue/'.$xobj->getObjectID().'/comment',
-              'POST',
-              array(
-                'body' => $story_text,
-              ))->resolveJSON();
+            $jira_key = $xobj->getObjectID();
+
+            if ($this->shouldPostComment()) {
+              $this->postComment($account, $jira_key);
+            }
+
+            if ($this->shouldPostLink()) {
+              $this->postLink($account, $jira_key);
+            }
+
             break;
           } catch (HTTPFutureResponseStatus $ex) {
             phlog($ex);
             $this->log(
               "%s\n",
               pht(
                 'Failed to update object %s using user %s.',
                 $xobj->getObjectID(),
                 $account->getUserPHID()));
           }
         }
       }
     }
   }
 
 
 /* -(  Internals  )---------------------------------------------------------- */
 
 
   /**
    * Get the active JIRA provider.
    *
    * @return PhabricatorJIRAAuthProvider Active JIRA auth provider.
    * @task internal
    */
   private function getProvider() {
     if (!$this->provider) {
       $provider = PhabricatorJIRAAuthProvider::getJIRAProvider();
       if (!$provider) {
         throw new PhabricatorWorkerPermanentFailureException(
           pht('No JIRA provider configured.'));
       }
       $this->provider = $provider;
     }
     return $this->provider;
   }
 
 
   /**
    * Get a list of users to act as when publishing into JIRA.
    *
    * @return list<phid> Candidate user PHIDs to act as when publishing this
    *                    story.
    * @task internal
    */
   private function findUsersToPossess() {
     $object = $this->getStoryObject();
     $publisher = $this->getPublisher();
     $data = $this->getFeedStory()->getStoryData();
 
     // Figure out all the users related to the object. Users go into one of
     // four buckets. For JIRA integration, we don't care about which bucket
     // a user is in, since we just want to publish an update to linked objects.
 
     $owner_phid = $publisher->getOwnerPHID($object);
     $active_phids = $publisher->getActiveUserPHIDs($object);
     $passive_phids = $publisher->getPassiveUserPHIDs($object);
     $follow_phids = $publisher->getCCUserPHIDs($object);
 
     $all_phids = array_merge(
       array($owner_phid),
       $active_phids,
       $passive_phids,
       $follow_phids);
     $all_phids = array_unique(array_filter($all_phids));
 
     // Even if the actor isn't a reviewer, etc., try to use their account so
     // we can post in the correct voice. If we miss, we'll try all the other
     // related users.
 
     $try_users = array_merge(
       array($data->getAuthorPHID()),
       $all_phids);
     $try_users = array_filter($try_users);
 
     return $try_users;
   }
 
+  private function shouldPostComment() {
+    return $this->getProvider()->shouldCreateJIRAComment();
+  }
+
+  private function shouldPostLink() {
+    return $this->getProvider()->shouldCreateJIRALink();
+  }
+
+  private function postComment($account, $jira_key) {
+    $provider = $this->getProvider();
+
+    $provider->newJIRAFuture(
+      $account,
+      'rest/api/2/issue/'.$jira_key.'/comment',
+      'POST',
+      array(
+        'body' => $this->renderStoryText(),
+      ))->resolveJSON();
+  }
+
   private function renderStoryText() {
     $object = $this->getStoryObject();
     $publisher = $this->getPublisher();
 
     $text = $publisher->getStoryText($object);
-    $uri = $publisher->getObjectURI($object);
 
-    return $text."\n\n".$uri;
+    if ($this->shouldPostLink()) {
+      return $text;
+    } else {
+      // include the link in the comment
+      return $text."\n\n".$publisher->getObjectURI($object);
+    }
   }
 
+  private function postLink($account, $jira_key) {
+    $provider = $this->getProvider();
+    $object = $this->getStoryObject();
+    $publisher = $this->getPublisher();
+    $icon_uri = celerity_get_resource_uri('rsrc/favicons/favicon-16x16.png');
+
+    $provider->newJIRAFuture(
+      $account,
+      'rest/api/2/issue/'.$jira_key.'/remotelink',
+      'POST',
+
+      // format documented at http://bit.ly/1K5T0Li
+      array(
+        'globalId' => $object->getPHID(),
+        'application' => array(
+          'type' => 'com.phacility.phabricator',
+          'name' => 'Phabricator',
+        ),
+        'relationship' => 'implemented in',
+        'object' => array(
+          'url'     => $publisher->getObjectURI($object),
+          'title'   => $publisher->getObjectTitle($object),
+          'icon'    => array(
+            'url16x16'  => $icon_uri,
+            'title'     => 'Phabricator',
+          ),
+          'status' => array(
+            'resolved' => $publisher->isObjectClosed($object),
+          ),
+        ),
+      ))->resolveJSON();
+  }
 }