diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f941a6274b..b4aad3e01e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -680,6 +680,7 @@ phutil_register_library_map(array(
     'PhabricatorApplicationTransactionController' => 'applications/transactions/controller/PhabricatorApplicationTransactionController.php',
     'PhabricatorApplicationTransactionEditor' => 'applications/transactions/editor/PhabricatorApplicationTransactionEditor.php',
     'PhabricatorApplicationTransactionFeedStory' => 'applications/transactions/feed/PhabricatorApplicationTransactionFeedStory.php',
+    'PhabricatorApplicationTransactionInterface' => 'applications/transactions/interface/PhabricatorApplicationTransactionInterface.php',
     'PhabricatorApplicationTransactionNoEffectException' => 'applications/transactions/exception/PhabricatorApplicationTransactionNoEffectException.php',
     'PhabricatorApplicationTransactionNoEffectResponse' => 'applications/transactions/response/PhabricatorApplicationTransactionNoEffectResponse.php',
     'PhabricatorApplicationTransactionQuery' => 'applications/transactions/query/PhabricatorApplicationTransactionQuery.php',
@@ -2390,6 +2391,7 @@ phutil_register_library_map(array(
     array(
       0 => 'PhabricatorFileDAO',
       1 => 'PhabricatorSubscribableInterface',
+      2 => 'PhabricatorApplicationTransactionInterface',
     ),
     'PhabricatorFileInfoController' => 'PhabricatorFileController',
     'PhabricatorFileLinkListView' => 'AphrontView',
diff --git a/src/applications/macro/storage/PhabricatorFileImageMacro.php b/src/applications/macro/storage/PhabricatorFileImageMacro.php
index 9c59f9699f..470d1a7ab4 100644
--- a/src/applications/macro/storage/PhabricatorFileImageMacro.php
+++ b/src/applications/macro/storage/PhabricatorFileImageMacro.php
@@ -1,7 +1,9 @@
 <?php
 
 final class PhabricatorFileImageMacro extends PhabricatorFileDAO
-  implements PhabricatorSubscribableInterface {
+  implements
+    PhabricatorSubscribableInterface,
+    PhabricatorApplicationTransactionInterface {
 
   protected $filePHID;
   protected $phid;
@@ -23,5 +25,13 @@ final class PhabricatorFileImageMacro extends PhabricatorFileDAO
     return false;
   }
 
+  public function getApplicationTransactionEditor() {
+    return new PhabricatorMacroEditor();
+  }
+
+  public function getApplicationTransactionObject() {
+    return new PhabricatorMacroTransaction();
+  }
+
 }
 
diff --git a/src/applications/pholio/storage/PholioMock.php b/src/applications/pholio/storage/PholioMock.php
index 11f6f8b95c..1846285db5 100644
--- a/src/applications/pholio/storage/PholioMock.php
+++ b/src/applications/pholio/storage/PholioMock.php
@@ -8,7 +8,8 @@ final class PholioMock extends PholioDAO
     PhabricatorMarkupInterface,
     PhabricatorPolicyInterface,
     PhabricatorSubscribableInterface,
-    PhabricatorTokenReceiverInterface {
+    PhabricatorTokenReceiverInterface,
+    PhabricatorApplicationTransactionInterface {
 
   const MARKUP_FIELD_DESCRIPTION  = 'markup:description';
 
@@ -123,4 +124,17 @@ final class PholioMock extends PholioDAO
     return (bool)$this->getID();
   }
 
+
+/* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
+
+
+  public function getApplicationTransactionEditor() {
+    return new PholioMockEditor();
+  }
+
+  public function getApplicationTransactionObject() {
+    return new PholioTransaction();
+  }
+
+
 }
diff --git a/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php b/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
index c17121add6..e3f5824374 100644
--- a/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
+++ b/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
@@ -58,17 +58,49 @@ final class PhabricatorSubscriptionsEditController
         $handle->getURI());
     }
 
-    $editor = id(new PhabricatorSubscriptionsEditor())
-      ->setActor($user)
-      ->setObject($object);
+    if ($object instanceof PhabricatorApplicationTransactionInterface) {
+      if ($is_add) {
+        $xaction_value = array(
+          '+' => array($user->getPHID()),
+        );
+      } else {
+        $xaction_value = array(
+          '-' => array($user->getPHID()),
+        );
+      }
 
-    if ($is_add) {
-      $editor->subscribeExplicit(array($user->getPHID()), $explicit = true);
+      $xaction = id($object->getApplicationTransactionObject())
+        ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
+        ->setNewValue($xaction_value);
+
+      $editor = id($object->getApplicationTransactionEditor())
+        ->setActor($user)
+        ->setContinueOnNoEffect(true)
+        ->setContentSource(
+          PhabricatorContentSource::newForSource(
+            PhabricatorContentSource::SOURCE_WEB,
+            array(
+              'ip' => $request->getRemoteAddr(),
+            )));
+
+      $editor->applyTransactions($object, array($xaction));
     } else {
-      $editor->unsubscribe(array($user->getPHID()));
-    }
 
-    $editor->save();
+      // TODO: Eventually, get rid of this once everything implements
+      // PhabriatorApplicationTransactionInterface.
+
+      $editor = id(new PhabricatorSubscriptionsEditor())
+        ->setActor($user)
+        ->setObject($object);
+
+      if ($is_add) {
+        $editor->subscribeExplicit(array($user->getPHID()), $explicit = true);
+      } else {
+        $editor->unsubscribe(array($user->getPHID()));
+      }
+
+      $editor->save();
+    }
 
     // TODO: We should just render the "Unsubscribe" action and swap it out
     // in the document for Ajax requests.
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 349bb3c453..2754f53662 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -170,9 +170,20 @@ abstract class PhabricatorApplicationTransactionEditor
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         $subeditor = id(new PhabricatorSubscriptionsEditor())
           ->setObject($object)
-          ->setActor($this->requireActor())
-          ->subscribeExplicit($xaction->getNewValue())
-          ->save();
+          ->setActor($this->requireActor());
+
+        $old_map = array_fuse($xaction->getOldValue());
+        $new_map = array_fuse($xaction->getNewValue());
+
+        $subeditor->unsubscribe(
+          array_keys(
+            array_diff_key($old_map, $new_map)));
+
+        $subeditor->subscribeExplicit(
+          array_keys(
+            array_diff_key($new_map, $old_map)));
+
+        $subeditor->save();
         break;
     }
     return $this->applyCustomExternalTransaction($object, $xaction);
diff --git a/src/applications/transactions/interface/PhabricatorApplicationTransactionInterface.php b/src/applications/transactions/interface/PhabricatorApplicationTransactionInterface.php
new file mode 100644
index 0000000000..be9b01d95b
--- /dev/null
+++ b/src/applications/transactions/interface/PhabricatorApplicationTransactionInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+interface PhabricatorApplicationTransactionInterface {
+
+  public function getApplicationTransactionEditor();
+  public function getApplicationTransactionObject();
+
+}