diff --git a/src/main/scala/app/SettingsController.scala b/src/main/scala/app/SettingsController.scala
index c6f1f52..cdf7658 100644
--- a/src/main/scala/app/SettingsController.scala
+++ b/src/main/scala/app/SettingsController.scala
@@ -5,12 +5,19 @@
 
 class SettingsController extends SettingsControllerBase with RepositoryService with AccountService
 
-
 trait SettingsControllerBase extends ControllerBase { self: RepositoryService with AccountService =>
 
+  case class OptionsForm(description: Option[String], defaultBranch: String, repositoryType: Int)
+  
+  val optionsForm = mapping(
+    "description"    -> trim(label("Description"    , optional(text()))),
+    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100)))),
+    "repositoryType" -> trim(label("Repository Type", number()))
+  )(OptionsForm.apply)
+  
   case class CollaboratorForm(userName: String)
 
-  val form = mapping(
+  val collaboratorForm = mapping(
     "userName" -> trim(label("Username", text(required, collaborator)))
   )(CollaboratorForm.apply)
 
@@ -27,6 +34,16 @@
     settings.html.options(getRepository(owner, repository, servletContext).get)
   })
   
+  post("/:owner/:repository/settings/options", optionsForm){ form =>
+    val owner      = params("owner")
+    val repository = params("repository")
+    
+    // save repository options
+    saveRepositoryOptions(owner, repository, form.description, form.defaultBranch, form.repositoryType)
+    
+    redirect("%s/%s/settings/options".format(owner, repository))
+  }
+  
   get("/:owner/:repository/settings/collaborators")(ownerOnly {
     val owner      = params("owner")
     val repository = params("repository")
@@ -34,7 +51,7 @@
     settings.html.collaborators(getCollaborators(owner, repository), getRepository(owner, repository, servletContext).get)
   })
 
-  post("/:owner/:repository/settings/collaborators/_add", form)(ownerOnly { form =>
+  post("/:owner/:repository/settings/collaborators/_add", collaboratorForm)(ownerOnly { form =>
     val owner      = params("owner")
     val repository = params("repository")
     addCollaborator(owner, repository, form.userName)
diff --git a/src/main/scala/service/RepositoryService.scala b/src/main/scala/service/RepositoryService.scala
index 5bf999d..ab87879 100644
--- a/src/main/scala/service/RepositoryService.scala
+++ b/src/main/scala/service/RepositoryService.scala
@@ -106,13 +106,21 @@
   /**
    * Updates the last activity date of the repository.
    */
-  def updateLastActivityDate(userName: String, repositoryName: String): Unit = {
-    val q = for {
-      r <- Repositories if (r.userName is userName.bind) && (r.repositoryName is repositoryName.bind)
-    } yield r.lastActivityDate
-    
-    q.update(new java.sql.Date(System.currentTimeMillis))
-  }
+  def updateLastActivityDate(userName: String, repositoryName: String): Unit =
+    Query(Repositories)
+      .filter { r => (r.userName is userName.bind) && (r.repositoryName is repositoryName.bind) }
+      .map    { _.lastActivityDate }
+      .update (new java.sql.Date(System.currentTimeMillis))
+  
+  /**
+   * Save repository options.
+   */
+  def saveRepositoryOptions(userName: String, repositoryName: String, 
+      description: Option[String], defaultBranch: String, repositoryType: Int): Unit =
+    Query(Repositories)
+      .filter { r => (r.userName is userName.bind) && (r.repositoryName is repositoryName.bind) }
+      .map    { r => r.description.? ~ r.defaultBranch ~ r.repositoryType ~ r.updatedDate }
+      .update (description, defaultBranch, repositoryType, new java.sql.Date(System.currentTimeMillis))
 
   /**
    * Add collaborator to the repository.
diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html
index c02cda3..a8d2f5d 100644
--- a/src/main/twirl/settings/options.scala.html
+++ b/src/main/twirl/settings/options.scala.html
@@ -3,30 +3,38 @@
 @html.main("Settings"){
   @html.header("settings", repository)
   @menu("options", repository){
-    <form id="form" method="post" action="@path/new" validate="true">
+    <form id="form" method="post" action="@path/@repository.owner/@repository.name/settings/options" validate="true">
       <div class="box">
         <div class="box-header">Settings</div>
         <div class="box-content">
           <fieldset>
+            <label for="description"><strong>Description</strong></label>
+            <input type="text" name="description" id="description" style="width: 600px;" value="@repository.repository.description"/>
+          </fieldset>
+          <hr>
+          <fieldset>
             <label for="defaultBranch"><strong>Default Branch</strong></label>
             <select name="defaultBranch" id="defaultBranch">
-              <option value="master">master</option>
+              @repository.branchList.map { branch =>
+                <option value="@branch"@if(branch==repository.repository.defaultBranch){ selected}>@branch</option>
+              }
             </select>
           </fieldset>
           <hr>
           <fieldset>
             <label><strong>Repository Type</strong></label>
             <label>
-              <input type="radio" name="repositoryType" value="0" checked>
+              <input type="radio" name="repositoryType" value="0"@if(repository.repository.repositoryType==0){ checked}>
               <strong>Public</strong> - All users and guests can read this repository.
             </label>
             <label>
-              <input type="radio" name="repositoryType" value="1">
+              <input type="radio" name="repositoryType" value="1"@if(repository.repository.repositoryType==1){ checked}>
               <strong>Private</strong> - Only collaborators can read this repository.
             </label>
           </fieldset>
         </div>
       </div>
+      <!--
       <div class="box">
         <div class="box-header">Features</div>
         <div class="box-content">
@@ -56,6 +64,7 @@
           </dl>
         </div>
       </div>
+      -->
       <fieldset>
         <input type="submit" class="btn btn-primary" value="Apply changes"/>
         <!--