Index: uspace/lib/c/generic/stdio/scanf.c
===================================================================
--- uspace/lib/c/generic/stdio/scanf.c	(revision 5a6c28d195eff93f3ee378bd1f116b66a4c0fd9c)
+++ uspace/lib/c/generic/stdio/scanf.c	(revision 39f84ce451a7ec890020a3dfcbe3655909062383)
@@ -886,4 +886,6 @@
 /** Determine if character is in scanset.
  *
+ * Note that we support ranges, although that is a GNU extension.
+ *
  * @param c Character
  * @param scanset Pointer to scanset
@@ -894,4 +896,6 @@
 	const char *p = scanset;
 	bool inverted = false;
+	char startc;
+	char endc;
 
 	/* Inverted scanset */
@@ -901,13 +905,34 @@
 	}
 
-	/* ']' character in scanset */
+	/*
+	 * Either ']' or '-' at beginning or after '^' loses special meaning.
+	 * However, '-' after ']' (or vice versa) does not.
+	 */
 	if (*p == ']') {
+		/* ']' character in scanset */
 		if (c == ']')
 			return !inverted;
 		++p;
+	} else if (*p == '-') {
+		/* '-' character in scanset */
+		if (c == '-')
+			return !inverted;
+		++p;
 	}
 
 	/* Remaining characters */
 	while (*p != '\0' && *p != ']') {
+		/* '-' is a range unless it's the last character in scanset */
+		if (*p == '-' && p[1] != ']' && p[1] != '\0') {
+			startc = p[-1];
+			endc = p[1];
+
+			if (c >= startc && c <= endc)
+				return !inverted;
+
+			p += 2;
+			continue;
+		}
+
 		if (*p == c)
 			return !inverted;
Index: uspace/lib/c/test/stdio/scanf.c
===================================================================
--- uspace/lib/c/test/stdio/scanf.c	(revision 5a6c28d195eff93f3ee378bd1f116b66a4c0fd9c)
+++ uspace/lib/c/test/stdio/scanf.c	(revision 39f84ce451a7ec890020a3dfcbe3655909062383)
@@ -781,5 +781,5 @@
 }
 
-PCUT_TEST(set_negated)
+PCUT_TEST(set_inverted)
 {
 	int rc;
@@ -825,4 +825,89 @@
 	PCUT_ASSERT_TRUE(chars[1] == 'b');
 	PCUT_ASSERT_TRUE(chars[2] == 'c');
+	PCUT_ASSERT_TRUE(chars[3] == '\0');
+	PCUT_ASSERT_TRUE(chars[4] == 'X');
+}
+
+PCUT_TEST(set_with_leading_dash)
+{
+	int rc;
+	char chars[chars_size];
+
+	/* Set conversion with leading '-' in scanset */
+	memset(chars, 'X', chars_size);
+	rc = sscanf("a-bc[", "%[-abc]", chars);
+	PCUT_ASSERT_INT_EQUALS(1, rc);
+	PCUT_ASSERT_TRUE(chars[0] == 'a');
+	PCUT_ASSERT_TRUE(chars[1] == '-');
+	PCUT_ASSERT_TRUE(chars[2] == 'b');
+	PCUT_ASSERT_TRUE(chars[3] == 'c');
+	PCUT_ASSERT_TRUE(chars[4] == '\0');
+	PCUT_ASSERT_TRUE(chars[5] == 'X');
+}
+
+PCUT_TEST(set_with_trailing_dash)
+{
+	int rc;
+	char chars[chars_size];
+
+	/* Set conversion with trailing '-' in scanset */
+	memset(chars, 'X', chars_size);
+	rc = sscanf("a-bc]", "%[abc-]", chars);
+	PCUT_ASSERT_INT_EQUALS(1, rc);
+	PCUT_ASSERT_TRUE(chars[0] == 'a');
+	PCUT_ASSERT_TRUE(chars[1] == '-');
+	PCUT_ASSERT_TRUE(chars[2] == 'b');
+	PCUT_ASSERT_TRUE(chars[3] == 'c');
+	PCUT_ASSERT_TRUE(chars[4] == '\0');
+	PCUT_ASSERT_TRUE(chars[5] == 'X');
+}
+
+PCUT_TEST(set_inverted_with_leading_dash)
+{
+	int rc;
+	char chars[chars_size];
+
+	/* Set conversion with leading '-' in inverted scanset */
+	memset(chars, 'X', chars_size);
+	rc = sscanf("def-", "%[^-abc]", chars);
+	PCUT_ASSERT_INT_EQUALS(1, rc);
+	PCUT_ASSERT_TRUE(chars[0] == 'd');
+	PCUT_ASSERT_TRUE(chars[1] == 'e');
+	PCUT_ASSERT_TRUE(chars[2] == 'f');
+	PCUT_ASSERT_TRUE(chars[3] == '\0');
+	PCUT_ASSERT_TRUE(chars[4] == 'X');
+}
+
+PCUT_TEST(set_inverted_with_only_dash)
+{
+	int rc;
+	char chars[chars_size];
+
+	/*
+	 * ']' after '^' in scanset does not lose meaning of scanset
+	 * delimiter
+	 */
+	memset(chars, 'X', chars_size);
+	rc = sscanf("abc-", "%[^-]", chars);
+	PCUT_ASSERT_INT_EQUALS(1, rc);
+	PCUT_ASSERT_TRUE(chars[0] == 'a');
+	PCUT_ASSERT_TRUE(chars[1] == 'b');
+	PCUT_ASSERT_TRUE(chars[2] == 'c');
+	PCUT_ASSERT_TRUE(chars[3] == '\0');
+	PCUT_ASSERT_TRUE(chars[4] == 'X');
+}
+
+PCUT_TEST(set_inverted_with_dash_caret)
+{
+	int rc;
+	char chars[chars_size];
+
+	/* '^' after '-' in scanset does not have special meaning */
+	memset(chars, 'X', chars_size);
+	rc = sscanf("-^a", "%[-^a]", chars);
+	PCUT_ASSERT_INT_EQUALS(1, rc);
+	PCUT_ASSERT_TRUE(chars[0] == '-');
+	PCUT_ASSERT_TRUE(chars[1] == '^');
+	PCUT_ASSERT_TRUE(chars[2] == 'a');
 	PCUT_ASSERT_TRUE(chars[3] == '\0');
 	PCUT_ASSERT_TRUE(chars[4] == 'X');