diff --git a/dmtree/tr181/deviceinfo-iopsyswrt.c b/dmtree/tr181/deviceinfo-iopsyswrt.c
index bb34d768..8ac53461 100644
--- a/dmtree/tr181/deviceinfo-iopsyswrt.c
+++ b/dmtree/tr181/deviceinfo-iopsyswrt.c
@@ -6,7 +6,11 @@
 char * os__get_deviceid_manufacturer()
 {
 	char *v;
-	db_get_value_string("device", "deviceinfo", "Manufacturer", &v);
+	dmuci_get_option_value_string("cwmp","cpe","manufacturer", &v);
+	if (v[0] == '\0') {
+		db_get_value_string("device", "deviceinfo", "Manufacturer", &v);
+		return v;
+	}
 	return v;
 }