diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 560813c41f7cf9ca9ee63af07b50fcc256a5d0c0..e69c6fd3026dd6ecc9f7fda812158ee8849f7d5a 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -72,6 +72,9 @@ public class ConfigurationController extends AbstractController {
 	@Value("${features.question-format.grid-square.enabled:false}")
 	private String gridSquareEnabled;
 
+	@Value("${answerOptionLimit:8}")
+	private String answerOptionLimit;
+
 	@RequestMapping(value = { "/" }, method = RequestMethod.GET)
 	@ResponseBody
 	public final HashMap<String, Object> getConfiguration(HttpServletRequest request) {
@@ -103,6 +106,8 @@ public class ConfigurationController extends AbstractController {
 			config.put("privacyPolicyUrl", privacyPolicyUrl);
 		}
 
+		config.put("answerOptionLimit", Integer.valueOf(answerOptionLimit));
+
 		config.put("features", features);
 
 		features.put("mathJax", "true".equals(mathJaxEnabled));
diff --git a/src/main/webapp/arsnova.properties.example b/src/main/webapp/arsnova.properties.example
index 5a0bca24444391e405d3acbeb1051f08c0aa0c42..7f398986a6182960b3e14ca152c8b67dcc3ebc94 100644
--- a/src/main/webapp/arsnova.properties.example
+++ b/src/main/webapp/arsnova.properties.example
@@ -63,6 +63,9 @@ feedback.cleanup=10
 # maximal filesize in bytes
 upload.filesize_b=1048576
 
+# maximal number of answer options allowed for a skill question
+question.answerOptionLimit=8
+
 couchdb.host=localhost
 couchdb.port=5984
 couchdb.name=arsnova
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 5a0bca24444391e405d3acbeb1051f08c0aa0c42..7f398986a6182960b3e14ca152c8b67dcc3ebc94 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -63,6 +63,9 @@ feedback.cleanup=10
 # maximal filesize in bytes
 upload.filesize_b=1048576
 
+# maximal number of answer options allowed for a skill question
+question.answerOptionLimit=8
+
 couchdb.host=localhost
 couchdb.port=5984
 couchdb.name=arsnova