diff --git a/headers/private/shared/DriverSettingsMessageAdapter.h b/headers/private/shared/DriverSettingsMessageAdapter.h
index e55b859fa2..347ce79aa8 100644
--- a/headers/private/shared/DriverSettingsMessageAdapter.h
+++ b/headers/private/shared/DriverSettingsMessageAdapter.h
@@ -22,10 +22,15 @@ public:
 	virtual	status_t			ConvertFromDriverSettings(
 									const driver_parameter& parameter,
 									const char* name, int32 index, uint32 type,
-									BMessage& target) = 0;
+									BMessage& target);
+	virtual	status_t			ConvertEmptyFromDriverSettings(
+									const driver_parameter& parameter,
+									const char* name, uint32 type,
+									BMessage& target);
+
 	virtual	status_t			ConvertToDriverSettings(const BMessage& source,
 									const char* name, int32 index,
-									uint32 type, BString& value) = 0;
+									uint32 type, BString& value);
 };
 
 
diff --git a/src/kits/shared/DriverSettingsMessageAdapter.cpp b/src/kits/shared/DriverSettingsMessageAdapter.cpp
index 27c6f2f762..f60354cf9e 100644
--- a/src/kits/shared/DriverSettingsMessageAdapter.cpp
+++ b/src/kits/shared/DriverSettingsMessageAdapter.cpp
@@ -28,6 +28,32 @@ DriverSettingsConverter::~DriverSettingsConverter()
 }
 
 
+status_t
+DriverSettingsConverter::ConvertFromDriverSettings(
+	const driver_parameter& parameter, const char* name, int32 index,
+	uint32 type, BMessage& target)
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+DriverSettingsConverter::ConvertEmptyFromDriverSettings(
+	const driver_parameter& parameter, const char* name, uint32 type,
+	BMessage& target)
+{
+	return B_NOT_SUPPORTED;
+}
+
+
+status_t
+DriverSettingsConverter::ConvertToDriverSettings(const BMessage& source,
+	const char* name, int32 index, uint32 type, BString& value)
+{
+	return B_NOT_SUPPORTED;
+}
+
+
 // #pragma mark -
 
 
@@ -133,14 +159,19 @@ const settings_template*
 DriverSettingsMessageAdapter::_FindSettingsTemplate(
 	const settings_template* settingsTemplate, const char* name)
 {
-	while (settingsTemplate->name != NULL) {
-		if (!strcmp(name, settingsTemplate->name))
+	const settings_template* wildcardTemplate = NULL;
+
+	while (settingsTemplate->type != 0) {
+		if (settingsTemplate->name != NULL
+			&& !strcmp(name, settingsTemplate->name))
 			return settingsTemplate;
 
+		if (settingsTemplate->name == NULL)
+			wildcardTemplate = settingsTemplate;
 		settingsTemplate++;
 	}
 
-	return NULL;
+	return wildcardTemplate;
 }
 
 
@@ -152,7 +183,7 @@ DriverSettingsMessageAdapter::_FindParentValueTemplate(
 	if (settingsTemplate == NULL)
 		return NULL;
 
-	while (settingsTemplate->name != NULL) {
+	while (settingsTemplate->type != 0) {
 		if (settingsTemplate->parent_value)
 			return settingsTemplate;
 
@@ -167,12 +198,15 @@ status_t
 DriverSettingsMessageAdapter::_AddParameter(const driver_parameter& parameter,
 	const settings_template& settingsTemplate, BMessage& message)
 {
+	const char* name = settingsTemplate.name;
+	if (name == NULL)
+		name = parameter.name;
+
 	for (int32 i = 0; i < parameter.value_count; i++) {
 		if (settingsTemplate.converter != NULL) {
 			status_t status
 				= settingsTemplate.converter->ConvertFromDriverSettings(
-					parameter, settingsTemplate.name, i, settingsTemplate.type,
-					message);
+					parameter, name, i, settingsTemplate.type, message);
 			if (status == B_OK)
 				continue;
 			if (status != B_NOT_SUPPORTED)
@@ -183,12 +217,10 @@ DriverSettingsMessageAdapter::_AddParameter(const driver_parameter& parameter,
 
 		switch (settingsTemplate.type) {
 			case B_STRING_TYPE:
-				status = message.AddString(settingsTemplate.name,
-					parameter.values[i]);
+				status = message.AddString(name, parameter.values[i]);
 				break;
 			case B_INT32_TYPE:
-				status = message.AddInt32(settingsTemplate.name,
-					atoi(parameter.values[i]));
+				status = message.AddInt32(name, atoi(parameter.values[i]));
 				break;
 			case B_BOOL_TYPE:
 			{
@@ -197,7 +229,7 @@ DriverSettingsMessageAdapter::_AddParameter(const driver_parameter& parameter,
 					|| !strcasecmp(parameter.values[i], "yes")
 					|| !strcasecmp(parameter.values[i], "enabled")
 					|| !strcasecmp(parameter.values[i], "1");
-				status = message.AddBool(settingsTemplate.name, value);
+				status = message.AddBool(name, value);
 				break;
 			}
 			case B_MESSAGE_TYPE:
@@ -210,9 +242,18 @@ DriverSettingsMessageAdapter::_AddParameter(const driver_parameter& parameter,
 		if (status != B_OK)
 			return status;
 	}
-	if (settingsTemplate.type == B_BOOL_TYPE && parameter.value_count == 0) {
-		// Empty boolean parameters are always true
-		return message.AddBool(settingsTemplate.name, true);
+
+	if (parameter.value_count == 0) {
+		if (settingsTemplate.converter != NULL) {
+			status_t status
+				= settingsTemplate.converter->ConvertEmptyFromDriverSettings(
+					parameter, name, settingsTemplate.type, message);
+			if (status == B_NOT_SUPPORTED)
+				return B_OK;
+		} else if (settingsTemplate.type == B_BOOL_TYPE) {
+			// Empty boolean parameters are always true
+			return message.AddBool(name, true);
+		}
 	}
 
 	return B_OK;
diff --git a/src/tests/kits/shared/DriverSettingsMessageAdapterTest.cpp b/src/tests/kits/shared/DriverSettingsMessageAdapterTest.cpp
index 409bd5a15a..5afa7633ef 100644
--- a/src/tests/kits/shared/DriverSettingsMessageAdapterTest.cpp
+++ b/src/tests/kits/shared/DriverSettingsMessageAdapterTest.cpp
@@ -234,7 +234,7 @@ DriverSettingsMessageAdapterTest::TestParent()
 void
 DriverSettingsMessageAdapterTest::TestConverter()
 {
-	class InterfaceAddressFamilyConverter : public DriverSettingsConverter {
+	class HexConverter : public DriverSettingsConverter {
 	public:
 		status_t ConvertFromDriverSettings(const driver_parameter& parameter,
 			const char* name, int32 index, uint32 type, BMessage& target)
@@ -274,6 +274,109 @@ DriverSettingsMessageAdapterTest::TestConverter()
 }
 
 
+void
+DriverSettingsMessageAdapterTest::TestWildcard()
+{
+	const settings_template kTemplateA[] = {
+		{B_STRING_TYPE, NULL, NULL},
+		{B_INT32_TYPE, "test", NULL},
+		{}
+	};
+
+	Settings settingsA("this is\n"
+		"just a\n"
+		"test 42 43");
+	BMessage message;
+	CPPUNIT_ASSERT_EQUAL(B_OK, settingsA.ToMessage(kTemplateA, message));
+	CPPUNIT_ASSERT_EQUAL(42, message.GetInt32("test", 0, 0));
+	CPPUNIT_ASSERT_EQUAL(43, message.GetInt32("test", 1, 0));
+	CPPUNIT_ASSERT_EQUAL(3, message.CountNames(B_ANY_TYPE));
+	CPPUNIT_ASSERT_EQUAL(BString("is"),
+		BString(message.GetString("this", "-")));
+	CPPUNIT_ASSERT_EQUAL(BString("a"),
+		BString(message.GetString("just", "-")));
+
+	const settings_template kSubTemplateB[] = {
+		{B_STRING_TYPE, NULL, NULL, true},
+		{}
+	};
+	const settings_template kTemplateB[] = {
+		{B_MESSAGE_TYPE, "it", kSubTemplateB},
+		{}
+	};
+
+	Settings settingsB("it just works\n");
+	CPPUNIT_ASSERT_EQUAL(B_OK, settingsB.ToMessage(kTemplateB, message));
+	CPPUNIT_ASSERT_EQUAL(1, message.CountNames(B_ANY_TYPE));
+	BMessage subMessage;
+	CPPUNIT_ASSERT_EQUAL(B_OK, message.FindMessage("it", &subMessage));
+	CPPUNIT_ASSERT_EQUAL(BString("just"),
+		BString(subMessage.GetString("it", 0, "-")));
+	CPPUNIT_ASSERT_EQUAL(BString("works"),
+		BString(subMessage.GetString("it", 1, "-")));
+	CPPUNIT_ASSERT_EQUAL(1, subMessage.CountNames(B_ANY_TYPE));
+
+	Settings settingsC("it {\n"
+		"\tstill works\n"
+		"}\n");
+	CPPUNIT_ASSERT_EQUAL(B_OK, settingsC.ToMessage(kTemplateB, message));
+	CPPUNIT_ASSERT_EQUAL(1, message.CountNames(B_ANY_TYPE));
+	CPPUNIT_ASSERT_EQUAL(B_OK, message.FindMessage("it", &subMessage));
+	CPPUNIT_ASSERT_EQUAL(BString("works"),
+		BString(subMessage.GetString("still", "-")));
+	CPPUNIT_ASSERT_EQUAL(1, subMessage.CountNames(B_ANY_TYPE));
+
+	class WildcardConverter : public DriverSettingsConverter {
+	public:
+		status_t ConvertFromDriverSettings(const driver_parameter& parameter,
+			const char* name, int32 index, uint32 type, BMessage& target)
+		{
+			BMessage message;
+			message.AddString("args", parameter.values[index]);
+			return target.AddMessage(parameter.name, &message);
+		}
+
+		status_t ConvertEmptyFromDriverSettings(
+			const driver_parameter& parameter, const char* name, uint32 type,
+			BMessage& target)
+		{
+			if (parameter.parameter_count != 0)
+				return B_OK;
+
+			BMessage message;
+			return target.AddMessage(name, &message);
+		}
+	} converter;
+
+	const settings_template kSubTemplateC[] = {
+		{B_STRING_TYPE, NULL, NULL, true, &converter},
+		{}
+	};
+	const settings_template kTemplateC[] = {
+		{B_MESSAGE_TYPE, "if", kSubTemplateC},
+		{}
+	};
+
+	Settings settingsD("if {\n"
+		"\tsafemode\n"
+		"\tfile_exists one\n"
+		"}\n");
+	CPPUNIT_ASSERT_EQUAL(B_OK, settingsD.ToMessage(kTemplateC, message));
+	CPPUNIT_ASSERT_EQUAL(1, message.CountNames(B_ANY_TYPE));
+	CPPUNIT_ASSERT_EQUAL(B_OK, message.FindMessage("if", &subMessage));
+	CPPUNIT_ASSERT_EQUAL(2, subMessage.CountNames(B_ANY_TYPE));
+	BMessage subSubMessage;
+	CPPUNIT_ASSERT_EQUAL(B_OK, subMessage.FindMessage("safemode",
+		&subSubMessage));
+	CPPUNIT_ASSERT(subSubMessage.IsEmpty());
+	CPPUNIT_ASSERT_EQUAL(B_OK, subMessage.FindMessage("file_exists",
+		&subSubMessage));
+	CPPUNIT_ASSERT_EQUAL(BString("one"),
+		BString(subSubMessage.GetString("args", 0, "-")));
+	CPPUNIT_ASSERT_EQUAL(1, subSubMessage.CountNames(B_ANY_TYPE));
+}
+
+
 /*static*/ void
 DriverSettingsMessageAdapterTest::AddTests(BTestSuite& parent)
 {
@@ -292,6 +395,9 @@ DriverSettingsMessageAdapterTest::AddTests(BTestSuite& parent)
 	suite.addTest(new CppUnit::TestCaller<DriverSettingsMessageAdapterTest>(
 		"DriverSettingsMessageAdapterTest::TestConverter",
 		&DriverSettingsMessageAdapterTest::TestConverter));
+	suite.addTest(new CppUnit::TestCaller<DriverSettingsMessageAdapterTest>(
+		"DriverSettingsMessageAdapterTest::TestWildcard",
+		&DriverSettingsMessageAdapterTest::TestWildcard));
 
 	parent.addTest("DriverSettingsMessageAdapterTest", &suite);
 }
diff --git a/src/tests/kits/shared/DriverSettingsMessageAdapterTest.h b/src/tests/kits/shared/DriverSettingsMessageAdapterTest.h
index 11ce9fdc38..bc6eb6e93e 100644
--- a/src/tests/kits/shared/DriverSettingsMessageAdapterTest.h
+++ b/src/tests/kits/shared/DriverSettingsMessageAdapterTest.h
@@ -19,6 +19,7 @@ public:
 			void				TestMessage();
 			void				TestParent();
 			void				TestConverter();
+			void				TestWildcard();
 
 	static	void				AddTests(BTestSuite& suite);
 };