diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 75de2e43c..a38f63b03 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -137,6 +137,30 @@ def fetch_activities(recipients, opts \\ %{}) do
     |> Enum.reverse
   end
 
+  def announce(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object) do
+    data = %{
+      "type" => "Announce",
+      "actor" => ap_id,
+      "object" => id,
+      "to" => [User.ap_followers(user)]
+    }
+
+    {:ok, activity} = insert(data)
+
+    announcements = [ap_id | (object.data["announcements"] || [])] |> Enum.uniq
+
+    new_data = object.data
+    |> Map.put("announcement_count", length(announcements))
+    |> Map.put("announcements", announcements)
+
+    changeset = Ecto.Changeset.change(object, data: new_data)
+    {:ok, object} = Repo.update(changeset)
+
+    update_object_in_activities(object)
+
+    {:ok, activity, object}
+  end
+
   def fetch_activities_for_context(context) do
     query = from activity in Activity,
       where: fragment("? @> ?", activity.data, ^%{ context: context })
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 203dcaec2..b5f81da0c 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -162,6 +162,21 @@ test "unliking a previously liked object" do
     end
   end
 
+  describe "announcing an object" do
+    test "adds an announce activity to the db" do
+      note_activity = insert(:note_activity)
+      object = Object.get_by_ap_id(note_activity.data["object"]["id"])
+      user = insert(:user)
+
+      {:ok, announce_activity, object} = ActivityPub.announce(user, object)
+      assert object.data["announcement_count"] == 1
+      assert object.data["announcements"] == [user.ap_id]
+      assert announce_activity.data["to"] == [User.ap_followers(user)]
+      assert announce_activity.data["object"] == object.data["id"]
+      assert announce_activity.data["actor"] == user.ap_id
+    end
+  end
+
   describe "uploading files" do
     test "copies the file to the configured folder" do
       file = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg"}