diff --git a/Gemfile.lock b/Gemfile.lock
index 8ae03428..31c70b7b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -369,6 +369,3 @@ DEPENDENCIES
   travis-yaml!
   unicorn
   yard-sinatra!
-
-BUNDLED WITH
-   1.10.6
diff --git a/lib/travis/api/v3/models/repository.rb b/lib/travis/api/v3/models/repository.rb
index b5cd94f8..ed35b5a2 100644
--- a/lib/travis/api/v3/models/repository.rb
+++ b/lib/travis/api/v3/models/repository.rb
@@ -6,6 +6,7 @@ module Travis::API::V3
     has_many :builds,      dependent: :delete_all, order: 'builds.id DESC'.freeze
     has_many :permissions, dependent: :delete_all
     has_many :users,       through:   :permissions
+    has_many :stars
 
     belongs_to :owner, polymorphic: true
     belongs_to :last_build, class_name: 'Travis::API::V3::Models::Build'.freeze
diff --git a/lib/travis/api/v3/models/star.rb b/lib/travis/api/v3/models/star.rb
new file mode 100644
index 00000000..a9590b5d
--- /dev/null
+++ b/lib/travis/api/v3/models/star.rb
@@ -0,0 +1,6 @@
+module Travis::API::V3
+  class Models::Star < Model
+    belongs_to :user
+    belongs_to :repository
+  end
+end
diff --git a/lib/travis/api/v3/models/user.rb b/lib/travis/api/v3/models/user.rb
index 626996c0..d41fee33 100644
--- a/lib/travis/api/v3/models/user.rb
+++ b/lib/travis/api/v3/models/user.rb
@@ -6,6 +6,7 @@ module Travis::API::V3
     has_many :tokens,        dependent: :destroy
     has_many :organizations, through:   :memberships
     has_many :repositories,  as:        :owner
+    has_many :stars
     has_one  :subscription,  as:        :owner
 
     serialize :github_oauth_token, Extensions::EncryptedColumn.new(disable: true)
@@ -17,5 +18,9 @@ module Travis::API::V3
     def subscription
       super if Features.use_subscriptions?
     end
+
+    def starred_repository_ids
+      @starred_repository_ids ||= stars.map(&:repository_id)
+    end
   end
 end
diff --git a/lib/travis/api/v3/permissions/repository.rb b/lib/travis/api/v3/permissions/repository.rb
index 75f47597..5cfbf5bd 100644
--- a/lib/travis/api/v3/permissions/repository.rb
+++ b/lib/travis/api/v3/permissions/repository.rb
@@ -10,6 +10,14 @@ module Travis::API::V3
       write?
     end
 
+    def star?
+      write?
+    end
+
+    def unstar?
+      write?
+    end
+
     def create_request?
       write?
     end
diff --git a/lib/travis/api/v3/queries/repositories.rb b/lib/travis/api/v3/queries/repositories.rb
index 9c75c5b6..6197a0c1 100644
--- a/lib/travis/api/v3/queries/repositories.rb
+++ b/lib/travis/api/v3/queries/repositories.rb
@@ -1,26 +1,34 @@
 module Travis::API::V3
   class Queries::Repositories < Query
-    params :active, :private, prefix: :repository
+    params :active, :private, :starred, prefix: :repository
     sortable_by :id, :github_id, :owner_name, :name, active: sort_condition(:active)
 
-    def for_member(user)
-      all.joins(:users).where(users: user_condition(user), invalidated_at: nil)
+    def for_member(user, **options)
+      all(user: user, **options).joins(:users).where(users: user_condition(user), invalidated_at: nil)
     end
 
-    def for_owner(owner)
-      filter(owner.repositories)
+    def for_owner(owner, **options)
+      filter(owner.repositories, **options)
     end
 
-    def all
-      @all ||= filter(Models::Repository)
+    def all(**options)
+      filter(Models::Repository, **options)
     end
 
-    def filter(list)
+    def filter(list, user: nil)
       list = list.where(invalidated_at: nil)
       list = list.where(active:  bool(active))  unless active.nil?
       list = list.where(private: bool(private)) unless private.nil?
       list = list.includes(:owner) if includes? 'repository.owner'.freeze
 
+      if user and not starred.nil?
+        if bool(starred)
+          list = list.joins(:stars).where(stars: { user_id: user.id })
+        elsif user.starred_repository_ids.any?
+          list = list.where("repositories.id NOT IN (?)", user.starred_repository_ids)
+        end
+      end
+
       if includes? 'repository.last_build'.freeze or includes? 'build'.freeze
         list = list.includes(:last_build)
         list = list.includes(last_build: :commit) if includes? 'build.commit'.freeze
diff --git a/lib/travis/api/v3/queries/repository.rb b/lib/travis/api/v3/queries/repository.rb
index a05d1c5b..aa1c2091 100644
--- a/lib/travis/api/v3/queries/repository.rb
+++ b/lib/travis/api/v3/queries/repository.rb
@@ -3,13 +3,31 @@ module Travis::API::V3
     params :id, :slug
 
     def find
+      @find ||= find!
+    end
+
+    def star(current_user)
+      repository = find
+      starred = Models::Star.where(repository_id: repository.id, user_id: current_user.id).first
+      Models::Star.create(repository_id: repository.id, user_id: current_user.id) unless starred
+      repository
+    end
+
+    def unstar(current_user)
+      repository = find
+      starred = Models::Star.where(repository_id: repository.id, user_id: current_user.id).first
+      starred.delete if starred
+      repository
+    end
+
+    private
+
+    def find!
       return by_slug if slug
       return Models::Repository.find_by_id(id) if id
       raise WrongParams, 'missing repository.id'.freeze
     end
 
-    private
-
     def by_slug
       owner_name, name = slug.split('/')
       Models::Repository.where(owner_name: owner_name, name: name, invalidated_at: nil).first
diff --git a/lib/travis/api/v3/renderer/repository.rb b/lib/travis/api/v3/renderer/repository.rb
index 96c3d217..46072e36 100644
--- a/lib/travis/api/v3/renderer/repository.rb
+++ b/lib/travis/api/v3/renderer/repository.rb
@@ -3,7 +3,7 @@ require 'travis/api/v3/renderer/model_renderer'
 module Travis::API::V3
   class Renderer::Repository < Renderer::ModelRenderer
     representation(:minimal,  :id, :name, :slug)
-    representation(:standard, :id, :name, :slug, :description, :github_language, :active, :private, :owner, :default_branch)
+    representation(:standard, :id, :name, :slug, :description, :github_language, :active, :private, :owner, :default_branch, :starred)
 
     def active
       !!model.active
@@ -19,6 +19,11 @@ module Travis::API::V3
       }
     end
 
+    def starred
+      return false unless user = access_control.user
+      user.starred_repository_ids.include? id
+    end
+
     def include_default_branch?
       return true if include? 'repository.default_branch'.freeze
       return true if include.any? { |i| i.start_with? 'branch'.freeze }
diff --git a/lib/travis/api/v3/routes.rb b/lib/travis/api/v3/routes.rb
index 0f80050a..4243edb4 100644
--- a/lib/travis/api/v3/routes.rb
+++ b/lib/travis/api/v3/routes.rb
@@ -69,6 +69,8 @@ module Travis::API::V3
 
       post :enable,  '/enable'
       post :disable, '/disable'
+      post :star,    '/star'
+      post :unstar,  '/unstar'
 
       resource :branch do
         route '/branch/{branch.name}'
diff --git a/lib/travis/api/v3/services/repositories/for_current_user.rb b/lib/travis/api/v3/services/repositories/for_current_user.rb
index b72c9396..450dfaae 100644
--- a/lib/travis/api/v3/services/repositories/for_current_user.rb
+++ b/lib/travis/api/v3/services/repositories/for_current_user.rb
@@ -1,6 +1,6 @@
 module Travis::API::V3
   class Services::Repositories::ForCurrentUser < Service
-    params :active, :private, prefix: :repository
+    params :active, :private, :starred, prefix: :repository
     paginate(default_limit: 100)
 
     def run!
diff --git a/lib/travis/api/v3/services/repositories/for_owner.rb b/lib/travis/api/v3/services/repositories/for_owner.rb
index 9dadddf1..b14f04cd 100644
--- a/lib/travis/api/v3/services/repositories/for_owner.rb
+++ b/lib/travis/api/v3/services/repositories/for_owner.rb
@@ -1,10 +1,10 @@
 module Travis::API::V3
   class Services::Repositories::ForOwner < Service
-    params :active, :private, prefix: :repository
+    params :active, :private, :starred, prefix: :repository
     paginate(default_limit: 100)
 
     def run!
-      unfiltered = query.for_owner(find(:owner))
+      unfiltered = query.for_owner(find(:owner), user: access_control.user)
       access_control.visible_repositories(unfiltered)
     end
   end
diff --git a/lib/travis/api/v3/services/repository/star.rb b/lib/travis/api/v3/services/repository/star.rb
new file mode 100644
index 00000000..0b29c2bb
--- /dev/null
+++ b/lib/travis/api/v3/services/repository/star.rb
@@ -0,0 +1,15 @@
+module Travis::API::V3
+  class Services::Repository::Star < Service
+    def run!
+      raise LoginRequired unless access_control.logged_in? or access_control.full_access?
+      raise NotFound      unless repository = find(:repository)
+      check_access(repository)
+      current_user = access_control.user
+      query.star(current_user)
+    end
+
+    def check_access(repository)
+      access_control.permissions(repository).star!
+    end
+  end
+end
diff --git a/lib/travis/api/v3/services/repository/unstar.rb b/lib/travis/api/v3/services/repository/unstar.rb
new file mode 100644
index 00000000..75874f9f
--- /dev/null
+++ b/lib/travis/api/v3/services/repository/unstar.rb
@@ -0,0 +1,15 @@
+module Travis::API::V3
+  class Services::Repository::Unstar < Service
+    def run!
+      raise LoginRequired unless access_control.logged_in? or access_control.full_access?
+      raise NotFound      unless repository = find(:repository)
+      check_access(repository)
+      current_user = access_control.user
+      query.unstar(current_user)
+    end
+
+    def check_access(repository)
+      access_control.permissions(repository).unstar!
+    end
+  end
+end
diff --git a/spec/v3/service_index_spec.rb b/spec/v3/service_index_spec.rb
index 8559b637..74c4ce69 100644
--- a/spec/v3/service_index_spec.rb
+++ b/spec/v3/service_index_spec.rb
@@ -64,7 +64,7 @@ describe Travis::API::V3::ServiceIndex do
 
         describe "for_current_user action" do
           let(:action) { resource.fetch("actions").fetch("for_current_user") }
-          specify { expect(action).to include("@type"=>"template", "request_method"=>"GET", "uri_template"=>"#{path}repos{?active,include,limit,offset,private,repository.active,repository.private,sort_by}") }
+          specify { expect(action).to include("@type"=>"template", "request_method"=>"GET", "uri_template"=>"#{path}repos{?active,include,limit,offset,private,repository.active,repository.private,repository.starred,sort_by,starred}") }
         end
       end
 
diff --git a/spec/v3/services/owner/find_spec.rb b/spec/v3/services/owner/find_spec.rb
index 5442e545..e48ecfb2 100644
--- a/spec/v3/services/owner/find_spec.rb
+++ b/spec/v3/services/owner/find_spec.rb
@@ -64,6 +64,8 @@ describe Travis::API::V3::Services::Owner::Find do
             "read"            => true,
             "enable"          => false,
             "disable"         => false,
+            "star"            => false,
+            "unstar"          => false,
             "create_request"  => false},
           "id"                => repo.id,
           "name"              => "example-repo",
@@ -77,7 +79,8 @@ describe Travis::API::V3::Services::Owner::Find do
             "@type"           => "branch",
             "@href"           => "/v3/repo/#{repo.id}/branch/master",
             "@representation" => "minimal",
-            "name"            => "master"}
+            "name"            => "master"},
+          "starred"           => false
         }]
       }}
     end
@@ -108,6 +111,8 @@ describe Travis::API::V3::Services::Owner::Find do
             "read"          => true,
             "enable"        => false,
             "disable"       => false,
+            "star"          => false,
+            "unstar"        => false,
             "create_request"=> false},
           "id"              => repo.id,
           "name"            => "example-repo",
@@ -121,7 +126,8 @@ describe Travis::API::V3::Services::Owner::Find do
             "@type"         => "branch",
             "@href"         => "/v3/repo/#{repo.id}/branch/master",
             "@representation"=> "minimal",
-            "name"           => "master"}
+            "name"          => "master"},
+          "starred"         => false
         }]
       }}
     end
diff --git a/spec/v3/services/repositories/for_current_user_spec.rb b/spec/v3/services/repositories/for_current_user_spec.rb
index d696df18..399eaa9f 100644
--- a/spec/v3/services/repositories/for_current_user_spec.rb
+++ b/spec/v3/services/repositories/for_current_user_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Travis::API::V3::Services::Repositories::ForCurrentUser do
-  let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
+  let(:repo)  { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:build) { repo.builds.first }
   let(:jobs)  { Travis::API::V3::Models::Build.find(build.id).jobs }
 
@@ -42,6 +42,8 @@ describe Travis::API::V3::Services::Repositories::ForCurrentUser do
           "read"             => true,
           "enable"           => true,
           "disable"          => true,
+          "star"             => true,
+          "unstar"           => true,
           "create_request"   => true},
         "id"                 =>  repo.id,
         "name"               =>  "minimal",
@@ -59,7 +61,9 @@ describe Travis::API::V3::Services::Repositories::ForCurrentUser do
           "@type"            => "branch",
           "@href"            => "/v3/repo/#{repo.id}/branch/master",
           "@representation"  => "minimal",
-          "name"             => "master"}}]
+          "name"             => "master"},
+        "starred"            => false
+        }]
     }}
   end
 
@@ -81,4 +85,29 @@ describe Travis::API::V3::Services::Repositories::ForCurrentUser do
     example { expect(last_response)                   .to be_ok            }
     example { expect(JSON.load(body)['repositories']) .to be == []         }
   end
+
+  describe "filter: starred=true" do
+    before  { Travis::API::V3::Models::Star.create(user: repo.owner, repository: repo)   }
+    before  { get("/v3/repos", {"starred" => "true"}, headers)                           }
+    after   { repo.owner.stars.each(&:destroy)                                           }
+    example { expect(last_response)                   .to be_ok                          }
+    example { expect(JSON.load(body)['@href'])        .to be == "/v3/repos?starred=true" }
+    example { expect(JSON.load(body)['repositories']) .not_to be_empty                   }
+  end
+
+  describe "filter: starred=false" do
+    before  { get("/v3/repos", {"starred" => "false"}, headers)                              }
+    example { expect(last_response)                   .to be_ok                              }
+    example { expect(JSON.load(body)['@href'])        .to be == "/v3/repos?starred=false"    }
+    example { expect(JSON.load(body)['repositories']) .not_to be_empty                       }
+  end
+
+  describe "filter: starred=false but no unstarred repos" do
+    before  { Travis::API::V3::Models::Star.create(user: repo.owner, repository: repo)       }
+    after   { repo.owner.stars.each(&:destroy)                                               }
+    before  { get("/v3/repos", {"starred" => "false"}, headers)                              }
+    example { expect(last_response)                   .to be_ok                              }
+    example { expect(JSON.load(body)['@href'])        .to be == "/v3/repos?starred=false"    }
+    example { expect(JSON.load(body)['repositories']) .to be_empty                           }
+  end
 end
diff --git a/spec/v3/services/repositories/for_owner_spec.rb b/spec/v3/services/repositories/for_owner_spec.rb
index dd639697..a6856581 100644
--- a/spec/v3/services/repositories/for_owner_spec.rb
+++ b/spec/v3/services/repositories/for_owner_spec.rb
@@ -42,6 +42,8 @@ describe Travis::API::V3::Services::Repositories::ForOwner do
           "read"             => true,
           "enable"           => false,
           "disable"          => false,
+          "star"             => false,
+          "unstar"           => false,
           "create_request"   => false},
         "id"                 => repo.id,
         "name"               => "minimal",
@@ -59,7 +61,9 @@ describe Travis::API::V3::Services::Repositories::ForOwner do
           "@type"            => "branch",
           "@href"            => "/v3/repo/#{repo.id}/branch/master",
           "@representation"  => "minimal",
-          "name"             => "master"}}]}}
+          "name"             => "master"},
+          "starred"          => false
+        }]}}
   end
 
   describe "filter: private=false" do
@@ -74,4 +78,29 @@ describe Travis::API::V3::Services::Repositories::ForOwner do
     example { expect(last_response)                   .to be_ok            }
     example { expect(JSON.load(body)['repositories']) .to be == []         }
   end
+
+  describe "filter: starred=true" do
+    before  { Travis::API::V3::Models::Star.create(user: repo.owner, repository: repo)   }
+    before  { get("/v3/repos", {"starred" => "true"}, headers)                           }
+    after   { repo.owner.stars.each(&:destroy)                                           }
+    example { expect(last_response)                   .to be_ok                          }
+    example { expect(JSON.load(body)['@href'])        .to be == "/v3/repos?starred=true" }
+    example { expect(JSON.load(body)['repositories']) .not_to be_empty                   }
+  end
+
+  describe "filter: starred=false" do
+    before  { get("/v3/repos", {"starred" => "false"}, headers)                              }
+    example { expect(last_response)                   .to be_ok                              }
+    example { expect(JSON.load(body)['@href'])        .to be == "/v3/repos?starred=false"    }
+    example { expect(JSON.load(body)['repositories']) .not_to be_empty                       }
+  end
+
+  describe "filter: starred=false but no unstarred repos" do
+    before  { Travis::API::V3::Models::Star.create(user: repo.owner, repository: repo)       }
+    after   { repo.owner.stars.each(&:destroy)                                               }
+    before  { get("/v3/repos", {"starred" => "false"}, headers)                              }
+    example { expect(last_response)                   .to be_ok                              }
+    example { expect(JSON.load(body)['@href'])        .to be == "/v3/repos?starred=false"    }
+    example { expect(JSON.load(body)['repositories']) .to be_empty                           }
+  end
 end
diff --git a/spec/v3/services/repository/disable_spec.rb b/spec/v3/services/repository/disable_spec.rb
new file mode 100644
index 00000000..991c2dd8
--- /dev/null
+++ b/spec/v3/services/repository/disable_spec.rb
@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Travis::API::V3::Services::Repository::Disable do
+  let(:repo)  { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
+
+  before do
+    repo.update_attributes!(active: true)
+  end
+
+  describe "not authenticated" do
+    before  { post("/v3/repo/#{repo.id}/disable")      }
+    example { expect(last_response.status).to be == 403 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "login_required",
+      "error_message" => "login required"
+    }}
+  end
+
+  describe "missing repo, authenticated" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { post("/v3/repo/9999999999/disable", {}, headers)                 }
+
+    example { expect(last_response.status).to be == 404 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "not_found",
+      "error_message" => "repository not found (or insufficient access)",
+      "resource_type" => "repository"
+    }}
+  end
+
+  describe "existing repository, no push access" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { post("/v3/repo/#{repo.id}/disable", {}, headers)                 }
+
+    example { expect(last_response.status).to be == 403 }
+    example { expect(JSON.load(body).to_s).to include(
+      "@type",
+      "error_type",
+      "insufficient_access",
+      "error_message",
+      "operation requires disable access to repository",
+      "resource_type",
+      "repository",
+      "permission",
+      "disable")
+    }
+  end
+
+  describe "private repository, no access" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { repo.update_attribute(:private, true)                             }
+    before        { post("/v3/repo/#{repo.id}/disable", {}, headers)                 }
+    after         { repo.update_attribute(:private, false)                            }
+
+    example { expect(last_response.status).to be == 404 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "not_found",
+      "error_message" => "repository not found (or insufficient access)",
+      "resource_type" => "repository"
+    }}
+  end
+
+  describe "existing repository, push access"
+  # as this reqires a call to github, and stubbing this request has proven difficult,
+  # this test has been omitted for now
+end
diff --git a/spec/v3/services/repository/enable_spec.rb b/spec/v3/services/repository/enable_spec.rb
new file mode 100644
index 00000000..fca71c2e
--- /dev/null
+++ b/spec/v3/services/repository/enable_spec.rb
@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Travis::API::V3::Services::Repository::Enable do
+  let(:repo)  { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
+
+  before do
+    repo.update_attributes!(active: false)
+  end
+
+  describe "not authenticated" do
+    before  { post("/v3/repo/#{repo.id}/enable")      }
+    example { expect(last_response.status).to be == 403 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "login_required",
+      "error_message" => "login required"
+    }}
+  end
+
+  describe "missing repo, authenticated" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { post("/v3/repo/9999999999/enable", {}, headers)                 }
+
+    example { expect(last_response.status).to be == 404 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "not_found",
+      "error_message" => "repository not found (or insufficient access)",
+      "resource_type" => "repository"
+    }}
+  end
+
+  describe "existing repository, no push access" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { post("/v3/repo/#{repo.id}/enable", {}, headers)                 }
+
+    example { expect(last_response.status).to be == 403 }
+    example { expect(JSON.load(body).to_s).to include(
+      "@type",
+      "error_type",
+      "insufficient_access",
+      "error_message",
+      "operation requires enable access to repository",
+      "resource_type",
+      "repository",
+      "permission",
+      "enable")
+    }
+  end
+
+  describe "private repository, no access" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { repo.update_attribute(:private, true)                             }
+    before        { post("/v3/repo/#{repo.id}/enable", {}, headers)                 }
+    after         { repo.update_attribute(:private, false)                            }
+
+    example { expect(last_response.status).to be == 404 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "not_found",
+      "error_message" => "repository not found (or insufficient access)",
+      "resource_type" => "repository"
+    }}
+  end
+
+  describe "existing repository, push access"
+  # as this reqires a call to github, and stubbing this request has proven difficult,
+  # this test has been omitted for now
+end
diff --git a/spec/v3/services/repository/find_spec.rb b/spec/v3/services/repository/find_spec.rb
index 2ea112d5..b5c0a10c 100644
--- a/spec/v3/services/repository/find_spec.rb
+++ b/spec/v3/services/repository/find_spec.rb
@@ -34,6 +34,8 @@ describe Travis::API::V3::Services::Repository::Find do
         "read"             => true,
         "enable"           => false,
         "disable"          => false,
+        "star"             => false,
+        "unstar"           => false,
         "create_request"   => false},
       "id"                 =>  repo.id,
       "name"               =>  "minimal",
@@ -51,7 +53,8 @@ describe Travis::API::V3::Services::Repository::Find do
         "@type"            => "branch",
         "@href"            => "/v3/repo/#{repo.id}/branch/master",
         "@representation"  => "minimal",
-        "name"             => "master"}
+        "name"             => "master"},
+      "starred"            => false
     }}
   end
 
@@ -108,6 +111,8 @@ describe Travis::API::V3::Services::Repository::Find do
         "read"             => true,
         "enable"           => false,
         "disable"          => false,
+        "star"             => false,
+        "unstar"           => false,
         "create_request"   => false},
       "id"                 =>  repo.id,
       "name"               =>  "minimal",
@@ -125,7 +130,8 @@ describe Travis::API::V3::Services::Repository::Find do
         "@type"            => "branch",
         "@href"            => "/v3/repo/#{repo.id}/branch/master",
         "@representation"  => "minimal",
-        "name"             => "master"}
+        "name"             => "master"},
+      "starred"            => false
     }}
   end
 
@@ -167,6 +173,8 @@ describe Travis::API::V3::Services::Repository::Find do
         "read"             => true,
         "enable"           => true,
         "disable"          => true,
+        "star"             => true,
+        "unstar"           => true,
         "create_request"   => true},
       "id"                 =>  repo.id,
       "name"               =>  "minimal",
@@ -184,7 +192,8 @@ describe Travis::API::V3::Services::Repository::Find do
         "@type"            => "branch",
         "@href"            => "/v3/repo/#{repo.id}/branch/master",
         "@representation"  => "minimal",
-        "name"             => "master"}
+        "name"             => "master"},
+      "starred"            => false
     }}
   end
 
@@ -232,6 +241,8 @@ describe Travis::API::V3::Services::Repository::Find do
         "read"             => true,
         "enable"           => true,
         "disable"          => true,
+        "star"             => true,
+        "unstar"           => true,
         "create_request"   => true},
       "id"                 =>  repo.id,
       "name"               =>  "minimal",
@@ -249,7 +260,8 @@ describe Travis::API::V3::Services::Repository::Find do
         "@type"            => "branch",
         "@href"            => "/v3/repo/#{repo.id}/branch/master",
         "@representation"  => "minimal",
-        "name"             => "master"}
+        "name"             => "master"},
+      "starred"            => false
     }}
   end
 
diff --git a/spec/v3/services/repository/star_spec.rb b/spec/v3/services/repository/star_spec.rb
new file mode 100644
index 00000000..f682768a
--- /dev/null
+++ b/spec/v3/services/repository/star_spec.rb
@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Travis::API::V3::Services::Repository::Star do
+  let(:repo)  { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
+
+  describe "not authenticated" do
+    before  { post("/v3/repo/#{repo.id}/star")      }
+    example { expect(last_response.status).to be == 403 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "login_required",
+      "error_message" => "login required"
+    }}
+  end
+
+  describe "missing repo, authenticated" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { post("/v3/repo/9999999999/star", {}, headers)                 }
+
+    example { expect(last_response.status).to be == 404 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "not_found",
+      "error_message" => "repository not found (or insufficient access)",
+      "resource_type" => "repository"
+    }}
+  end
+
+  describe "existing repository, no push access" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { post("/v3/repo/#{repo.id}/star", {}, headers)                 }
+
+    example { expect(last_response.status).to be == 403 }
+    example { expect(JSON.load(body).to_s).to include(
+      "@type",
+      "error_type",
+      "insufficient_access",
+      "error_message",
+      "operation requires star access to repository",
+      "resource_type",
+      "repository",
+      "permission",
+      "star")
+    }
+  end
+
+  describe "private repository, no access" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { repo.update_attribute(:private, true)                             }
+    before        { post("/v3/repo/#{repo.id}/star", {}, headers)                 }
+    after         { repo.update_attribute(:private, false)                            }
+
+    example { expect(last_response.status).to be == 404 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "not_found",
+      "error_message" => "repository not found (or insufficient access)",
+      "resource_type" => "repository"
+    }}
+  end
+
+  describe "existing repository, push access" 
+    #  this requires stubing a github request, which is difficult, so has been omitted for now
+
+end
diff --git a/spec/v3/services/repository/unstar_spec.rb b/spec/v3/services/repository/unstar_spec.rb
new file mode 100644
index 00000000..0778f4af
--- /dev/null
+++ b/spec/v3/services/repository/unstar_spec.rb
@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Travis::API::V3::Services::Repository::Unstar do
+  let(:repo)  { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
+
+  describe "not authenticated" do
+    before  { post("/v3/repo/#{repo.id}/unstar")      }
+    example { expect(last_response.status).to be == 403 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "login_required",
+      "error_message" => "login required"
+    }}
+  end
+
+  describe "missing repo, authenticated" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { post("/v3/repo/9999999999/unstar", {}, headers)                 }
+
+    example { expect(last_response.status).to be == 404 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "not_found",
+      "error_message" => "repository not found (or insufficient access)",
+      "resource_type" => "repository"
+    }}
+  end
+
+  describe "existing repository, no push access" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { post("/v3/repo/#{repo.id}/unstar", {}, headers)                 }
+
+    example { expect(last_response.status).to be == 403 }
+    example { expect(JSON.load(body).to_s).to include(
+      "@type",
+      "error_type",
+      "insufficient_access",
+      "error_message",
+      "operation requires unstar access to repository",
+      "resource_type",
+      "repository",
+      "permission",
+      "unstar")
+    }
+  end
+
+  describe "private repository, no access" do
+    let(:token)   { Travis::Api::App::AccessToken.create(user: repo.owner, app_id: 1) }
+    let(:headers) {{ 'HTTP_AUTHORIZATION' => "token #{token}"                        }}
+    before        { repo.update_attribute(:private, true)                             }
+    before        { post("/v3/repo/#{repo.id}/unstar", {}, headers)                 }
+    after         { repo.update_attribute(:private, false)                            }
+
+    example { expect(last_response.status).to be == 404 }
+    example { expect(JSON.load(body)).to      be ==     {
+      "@type"         => "error",
+      "error_type"    => "not_found",
+      "error_message" => "repository not found (or insufficient access)",
+      "resource_type" => "repository"
+    }}
+  end
+
+  describe "existing repository, push access"
+  #  this requires stubing a github request, which is difficult, so has been omitted for now
+  
+end