diff --git a/src/main/java/com/commafeed/frontend/model/Settings.java b/src/main/java/com/commafeed/frontend/model/Settings.java
index 61b067b4..bcd1d736 100644
--- a/src/main/java/com/commafeed/frontend/model/Settings.java
+++ b/src/main/java/com/commafeed/frontend/model/Settings.java
@@ -6,14 +6,25 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import com.wordnik.swagger.annotations.ApiClass;
+import com.wordnik.swagger.annotations.ApiProperty;
+
 @SuppressWarnings("serial")
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
+@ApiClass("User settings")
 public class Settings implements Serializable {
 
+	@ApiProperty(value = "user reads all entries or unread entries only", allowableValues = "all,unread", required = true)
 	private String readingMode;
+
+	@ApiProperty(value = "user reads entries in ascending or descending order", allowableValues = "asc,desc", required = true)
 	private String readingOrder;
+
+	@ApiProperty(value = "user wants category and feeds with no unread entries shown", required = true)
 	private boolean showRead;
+
+	@ApiProperty(value = "user's custom css for the website")
 	private String customCss;
 
 	public String getReadingMode() {
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/SettingsREST.java b/src/main/java/com/commafeed/frontend/rest/resources/SettingsREST.java
index aa2a7931..a57c932b 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/SettingsREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/SettingsREST.java
@@ -11,12 +11,17 @@ import com.commafeed.backend.model.UserSettings.ReadingMode;
 import com.commafeed.backend.model.UserSettings.ReadingOrder;
 import com.commafeed.frontend.model.Settings;
 import com.google.common.base.Preconditions;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
 
-@Path("settings")
+@Path("/settings")
+@Api(value = "/settings", description = "Operations about user settings")
 public class SettingsREST extends AbstractREST {
 
-	@Path("get")
+	@Path("/get")
 	@GET
+	@ApiOperation(value = "Retrieve user settings", notes = "Retrieve user settings", responseClass = "com.commafeed.frontend.model.Settings")
 	public Settings get() {
 		Settings s = new Settings();
 		UserSettings settings = userSettingsDAO.findByUser(getUser());
@@ -33,9 +38,10 @@ public class SettingsREST extends AbstractREST {
 		return s;
 	}
 
-	@Path("save")
+	@Path("/save")
 	@POST
-	public Response save(Settings settings) {
+	@ApiOperation(value = "Save user settings", notes = "Save user settings")
+	public Response save(@ApiParam Settings settings) {
 		Preconditions.checkNotNull(settings);
 
 		UserSettings s = userSettingsDAO.findByUser(getUser());