diff --git a/miniupnpd/upnpdescgen.c b/miniupnpd/upnpdescgen.c
index 42873db..c9dc76f 100644
--- a/miniupnpd/upnpdescgen.c
+++ b/miniupnpd/upnpdescgen.c
@@ -122,11 +122,13 @@ static const char * magicargname[] = {
 	"InternalClient",	/* 5 */
 	"InternalPort",		/* 6 */
 	"IsWorking",		/* 7 */
+#ifdef ENABLE_DP_SERVICE
 	"ProtocolType",		/* 8 */
 	"InMessage",		/* 9 */
 	"OutMessage",		/* 10 */
 	"ProtocolList",		/* 11 */
-	"RoleList"			/* 12 */
+	"RoleList",			/* 12 */
+#endif /* ENABLE_DP_SERVICE */
 };
 
 static const char xmlver[] =
@@ -763,21 +765,21 @@ static const struct serviceDesc scpd6FC =
 
 static const struct argument SendSetupMessageArgs[] =
 {
-	{1|0x80|(8<<2), 6},	/* ProtocolType */
-	{1|0x80|(9<<2), 5},	/* InMessage */
-	{2|0x80|(10<<2), 5},	/* OutMessage */
+	{1|0x80|(8<<2), 6},		/* ProtocolType : in ProtocolType / A_ARG_TYPE_String */
+	{1|0x80|(9<<2), 5},		/* InMessage : in InMessage / A_ARG_TYPE_Base64 */
+	{2|0x80|(10<<2), 5},	/* OutMessage : out OutMessage / A_ARG_TYPE_Base64 */
 	{0, 0}
 };
 
 static const struct argument GetSupportedProtocolsArgs[] =
 {
-	{2|0x80|(11<<2), 1},	/* ProtocolList */
+	{2|0x80|(11<<2), 1},	/* ProtocolList : out ProtocolList / SupportedProtocols */
 	{0, 0}
 };
 
 static const struct argument GetAssignedRolesArgs[] =
 {
-	{2|0x80|(12<<2), 6},	/* RoleList */
+	{2|0x80|(12<<2), 6},	/* RoleList : out RoleList / A_ARG_TYPE_String */
 	{0, 0}
 };