diff --git a/sys/compat/netbsd32/netbsd32_syscall.h b/sys/compat/netbsd32/netbsd32_syscall.h
index eafc456b10ee..95aae2ad4a2f 100644
--- a/sys/compat/netbsd32/netbsd32_syscall.h
+++ b/sys/compat/netbsd32/netbsd32_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.113 2015/06/20 19:56:24 martin Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.114 2015/06/21 08:29:52 martin Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.104 2015/06/20 19:55:07 martin Exp
+ * created from	NetBSD: syscalls.master,v 1.105 2015/06/21 08:28:36 martin Exp
  */
 
 #ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1144,6 +1144,12 @@
 /* syscall: "netbsd32_____sigtimedwait50" ret: "int" args: "const netbsd32_sigsetp_t" "netbsd32_siginfop_t" "netbsd32_timespecp_t" */
 #define	NETBSD32_SYS_netbsd32_____sigtimedwait50	431
 
+/* syscall: "netbsd32___mq_timedsend50" ret: "int" args: "mqd_t" "const netbsd32_charp" "netbsd32_size_t" "unsigned" "const netbsd32_timespecp_t" */
+#define	NETBSD32_SYS_netbsd32___mq_timedsend50	432
+
+/* syscall: "netbsd32___mq_timedreceive50" ret: "netbsd32_ssize_t" args: "mqd_t" "netbsd32_charp" "netbsd32_size_t" "netbsd32_uintp" "const netbsd32_timespecp_t" */
+#define	NETBSD32_SYS_netbsd32___mq_timedreceive50	433
+
 /* syscall: "compat_60_netbsd32__lwp_park" ret: "int" args: "const netbsd32_timespecp_t" "lwpid_t" "const netbsd32_voidp" "const netbsd32_voidp" */
 #define	NETBSD32_SYS_compat_60_netbsd32__lwp_park	434
 
diff --git a/sys/compat/netbsd32/netbsd32_syscallargs.h b/sys/compat/netbsd32/netbsd32_syscallargs.h
index 1f5db2c93de0..db225b771acd 100644
--- a/sys/compat/netbsd32/netbsd32_syscallargs.h
+++ b/sys/compat/netbsd32/netbsd32_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.113 2015/06/20 19:56:24 martin Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.114 2015/06/21 08:29:52 martin Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.104 2015/06/20 19:55:07 martin Exp
+ * created from	NetBSD: syscalls.master,v 1.105 2015/06/21 08:28:36 martin Exp
  */
 
 #ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2228,6 +2228,24 @@ struct netbsd32_____sigtimedwait50_args {
 };
 check_syscall_args(netbsd32_____sigtimedwait50)
 
+struct netbsd32___mq_timedsend50_args {
+	syscallarg(mqd_t) mqdes;
+	syscallarg(const netbsd32_charp) msg_ptr;
+	syscallarg(netbsd32_size_t) msg_len;
+	syscallarg(unsigned) msg_prio;
+	syscallarg(const netbsd32_timespecp_t) abs_timeout;
+};
+check_syscall_args(netbsd32___mq_timedsend50)
+
+struct netbsd32___mq_timedreceive50_args {
+	syscallarg(mqd_t) mqdes;
+	syscallarg(netbsd32_charp) msg_ptr;
+	syscallarg(netbsd32_size_t) msg_len;
+	syscallarg(netbsd32_uintp) msg_prio;
+	syscallarg(const netbsd32_timespecp_t) abs_timeout;
+};
+check_syscall_args(netbsd32___mq_timedreceive50)
+
 struct compat_60_netbsd32__lwp_park_args {
 	syscallarg(const netbsd32_timespecp_t) ts;
 	syscallarg(lwpid_t) unpark;
@@ -3305,6 +3323,10 @@ int	netbsd32___nanosleep50(struct lwp *, const struct netbsd32___nanosleep50_arg
 
 int	netbsd32_____sigtimedwait50(struct lwp *, const struct netbsd32_____sigtimedwait50_args *, register_t *);
 
+int	netbsd32___mq_timedsend50(struct lwp *, const struct netbsd32___mq_timedsend50_args *, register_t *);
+
+int	netbsd32___mq_timedreceive50(struct lwp *, const struct netbsd32___mq_timedreceive50_args *, register_t *);
+
 int	compat_60_netbsd32__lwp_park(struct lwp *, const struct compat_60_netbsd32__lwp_park_args *, register_t *);
 
 int	netbsd32___kevent50(struct lwp *, const struct netbsd32___kevent50_args *, register_t *);
diff --git a/sys/compat/netbsd32/netbsd32_syscalls.c b/sys/compat/netbsd32/netbsd32_syscalls.c
index 80c94dedda68..9f205fd879c2 100644
--- a/sys/compat/netbsd32/netbsd32_syscalls.c
+++ b/sys/compat/netbsd32/netbsd32_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.112 2015/06/20 19:56:24 martin Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.113 2015/06/21 08:29:52 martin Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.104 2015/06/20 19:55:07 martin Exp
+ * created from	NetBSD: syscalls.master,v 1.105 2015/06/21 08:28:36 martin Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.112 2015/06/20 19:56:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.113 2015/06/21 08:29:52 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
@@ -513,8 +513,8 @@ const char *const netbsd32_syscallnames[] = {
 	/* 429 */	"netbsd32___clock_getres50",
 	/* 430 */	"netbsd32___nanosleep50",
 	/* 431 */	"netbsd32_____sigtimedwait50",
-	/* 432 */	"#432 (unimplemented netbsd32___mq_timedsend50)",
-	/* 433 */	"#433 (unimplemented netbsd32___mq_timedreceive50)",
+	/* 432 */	"netbsd32___mq_timedsend50",
+	/* 433 */	"netbsd32___mq_timedreceive50",
 	/* 434 */	"compat_60_netbsd32__lwp_park",
 	/* 435 */	"netbsd32___kevent50",
 	/* 436 */	"netbsd32___pselect50",
diff --git a/sys/compat/netbsd32/netbsd32_sysent.c b/sys/compat/netbsd32/netbsd32_sysent.c
index 6e1e7d5747d7..655d6cbecd4f 100644
--- a/sys/compat/netbsd32/netbsd32_sysent.c
+++ b/sys/compat/netbsd32/netbsd32_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.112 2015/06/20 19:56:24 martin Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.113 2015/06/21 08:29:52 martin Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.104 2015/06/20 19:55:07 martin Exp
+ * created from	NetBSD: syscalls.master,v 1.105 2015/06/21 08:28:36 martin Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.112 2015/06/20 19:56:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.113 2015/06/21 08:29:52 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -1840,11 +1840,13 @@ struct sysent netbsd32_sysent[] = {
 		.sy_call = (sy_call_t *)netbsd32_____sigtimedwait50
 	},		/* 431 = netbsd32_____sigtimedwait50 */
 	{
-		.sy_call = sys_nosys,
-	},		/* 432 = filler */
+		ns(struct netbsd32___mq_timedsend50_args),
+		.sy_call = (sy_call_t *)netbsd32___mq_timedsend50
+	},		/* 432 = netbsd32___mq_timedsend50 */
 	{
-		.sy_call = sys_nosys,
-	},		/* 433 = filler */
+		ns(struct netbsd32___mq_timedreceive50_args),
+		.sy_call = (sy_call_t *)netbsd32___mq_timedreceive50
+	},		/* 433 = netbsd32___mq_timedreceive50 */
 	{
 		ns(struct compat_60_netbsd32__lwp_park_args),
 		.sy_call = (sy_call_t *)compat_60(netbsd32__lwp_park)
diff --git a/sys/compat/netbsd32/netbsd32_systrace_args.c b/sys/compat/netbsd32/netbsd32_systrace_args.c
index 39c9d2968246..cc50ca7a58fb 100644
--- a/sys/compat/netbsd32/netbsd32_systrace_args.c
+++ b/sys/compat/netbsd32/netbsd32_systrace_args.c
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.3 2015/06/20 19:56:24 martin Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.4 2015/06/21 08:29:52 martin Exp $ */
 
 /*
  * System call argument to DTrace register array converstion.
@@ -2993,6 +2993,28 @@ systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_
 		*n_args = 3;
 		break;
 	}
+	/* netbsd32___mq_timedsend50 */
+	case 432: {
+		struct netbsd32___mq_timedsend50_args *p = params;
+		iarg[0] = SCARG(p, mqdes); /* mqd_t */
+		uarg[1] = (intptr_t) SCARG(p, msg_ptr).i32; /* const netbsd32_charp */
+		iarg[2] = SCARG(p, msg_len); /* netbsd32_size_t */
+		uarg[3] = SCARG(p, msg_prio); /* unsigned */
+		uarg[4] = (intptr_t) SCARG(p, abs_timeout).i32; /* const netbsd32_timespecp_t */
+		*n_args = 5;
+		break;
+	}
+	/* netbsd32___mq_timedreceive50 */
+	case 433: {
+		struct netbsd32___mq_timedreceive50_args *p = params;
+		iarg[0] = SCARG(p, mqdes); /* mqd_t */
+		uarg[1] = (intptr_t) SCARG(p, msg_ptr).i32; /* netbsd32_charp */
+		iarg[2] = SCARG(p, msg_len); /* netbsd32_size_t */
+		uarg[3] = (intptr_t) SCARG(p, msg_prio).i32; /* netbsd32_uintp */
+		uarg[4] = (intptr_t) SCARG(p, abs_timeout).i32; /* const netbsd32_timespecp_t */
+		*n_args = 5;
+		break;
+	}
 	/* netbsd32__lwp_park */
 	case 434: {
 		struct compat_60_netbsd32__lwp_park_args *p = params;
@@ -8404,6 +8426,50 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
+	/* netbsd32___mq_timedsend50 */
+	case 432:
+		switch(ndx) {
+		case 0:
+			p = "mqd_t";
+			break;
+		case 1:
+			p = "const netbsd32_charp";
+			break;
+		case 2:
+			p = "netbsd32_size_t";
+			break;
+		case 3:
+			p = "unsigned";
+			break;
+		case 4:
+			p = "const netbsd32_timespecp_t";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* netbsd32___mq_timedreceive50 */
+	case 433:
+		switch(ndx) {
+		case 0:
+			p = "mqd_t";
+			break;
+		case 1:
+			p = "netbsd32_charp";
+			break;
+		case 2:
+			p = "netbsd32_size_t";
+			break;
+		case 3:
+			p = "netbsd32_uintp";
+			break;
+		case 4:
+			p = "const netbsd32_timespecp_t";
+			break;
+		default:
+			break;
+		};
+		break;
 	/* netbsd32__lwp_park */
 	case 434:
 		switch(ndx) {
@@ -10899,6 +10965,16 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
+	/* netbsd32___mq_timedsend50 */
+	case 432:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
+	/* netbsd32___mq_timedreceive50 */
+	case 433:
+		if (ndx == 0 || ndx == 1)
+			p = "netbsd32_ssize_t";
+		break;
 	/* netbsd32__lwp_park */
 	case 434:
 		if (ndx == 0 || ndx == 1)