diff --git a/commafeed-server/config.dev.yml b/commafeed-server/config.dev.yml
index 2da0ba27..eda8840e 100644
--- a/commafeed-server/config.dev.yml
+++ b/commafeed-server/config.dev.yml
@@ -4,7 +4,7 @@ app:
   # url used to access commafeed
   publicUrl: http://localhost:8082/
   
-  # wether to allow user registrations
+  # whether to allow user registrations
   allowRegistrations: true
 
   # whether to enable strict password validation (1 uppercase char, 1 lowercase char, 1 digit, 1 special char)
@@ -40,14 +40,14 @@ app:
   graphitePort: 2003
   graphiteInterval: 60
   
-  # wether this commafeed instance has a lot of feeds to refresh
+  # whether this commafeed instance has a lot of feeds to refresh
   # leave this to false in almost all cases
   heavyLoad: false
   
   # minimum amount of time commafeed will wait before refreshing the same feed
   refreshIntervalMinutes: 5
   
-  # wether to enable pubsub
+  # whether to enable pubsub
   # probably not needed if refreshIntervalMinutes is low
   pubsubhubbub: false
   
diff --git a/commafeed-server/config.yml.example b/commafeed-server/config.yml.example
index 490c8fca..d332b875 100644
--- a/commafeed-server/config.yml.example
+++ b/commafeed-server/config.yml.example
@@ -41,14 +41,14 @@ app:
   graphitePort: 2003
   graphiteInterval: 60
   
-  # wether this commafeed instance has a lot of feeds to refresh
+  # whether this commafeed instance has a lot of feeds to refresh
   # leave this to false in almost all cases
   heavyLoad: false
   
   # minimum amount of time commafeed will wait before refreshing the same feed
   refreshIntervalMinutes: 5
   
-  # wether to enable pubsub
+  # whether to enable pubsub
   # probably not needed if refreshIntervalMinutes is low
   pubsubhubbub: false
   
diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/Category.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Category.java
index 1003d7bc..66107b33 100644
--- a/commafeed-server/src/main/java/com/commafeed/frontend/model/Category.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/Category.java
@@ -31,7 +31,7 @@ public class Category implements Serializable {
 	@ApiModelProperty(value = "category feeds", required = true)
 	private List<Subscription> feeds = new ArrayList<>();
 
-	@ApiModelProperty(value = "wether the category is expanded or collapsed", required = true)
+	@ApiModelProperty(value = "whether the category is expanded or collapsed", required = true)
 	private boolean expanded;
 
 	@ApiModelProperty(value = "position of the category in the list", required = true)
diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java
index 38b7fe8f..1c35986a 100644
--- a/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java
@@ -45,7 +45,7 @@ public class Entry implements Serializable {
 	@ApiModelProperty(value = "comma-separated list of categories")
 	private String categories;
 
-	@ApiModelProperty(value = "wether entry content and title are rtl", required = true)
+	@ApiModelProperty(value = "whether entry content and title are rtl", required = true)
 	private boolean rtl;
 
 	@ApiModelProperty(value = "entry author")
@@ -99,7 +99,7 @@ public class Entry implements Serializable {
 	@ApiModelProperty(value = "starred status", required = true)
 	private boolean starred;
 
-	@ApiModelProperty(value = "wether the entry is still markable (old entry statuses are discarded)", required = true)
+	@ApiModelProperty(value = "whether the entry is still markable (old entry statuses are discarded)", required = true)
 	private boolean markable;
 
 	@ApiModelProperty(value = "tags", required = true)
diff --git a/commafeed-server/src/test/resources/config.test.yml b/commafeed-server/src/test/resources/config.test.yml
index b755d359..3ada8e1b 100644
--- a/commafeed-server/src/test/resources/config.test.yml
+++ b/commafeed-server/src/test/resources/config.test.yml
@@ -4,7 +4,7 @@ app:
   # url used to access commafeed
   publicUrl: http://localhost:8082/
   
-  # wether to allow user registrations
+  # whether to allow user registrations
   allowRegistrations: true
 
   # whether to enable strict password validation (1 uppercase char, 1 lowercase char, 1 digit, 1 special char)
@@ -40,14 +40,14 @@ app:
   graphitePort: 2003
   graphiteInterval: 60
   
-  # wether this commafeed instance has a lot of feeds to refresh
+  # whether this commafeed instance has a lot of feeds to refresh
   # leave this to false in almost all cases
   heavyLoad: false
   
   # minimum amount of time commafeed will wait before refreshing the same feed
   refreshIntervalMinutes: 5
   
-  # wether to enable pubsub
+  # whether to enable pubsub
   # probably not needed if refreshIntervalMinutes is low
   pubsubhubbub: false