Index: usr.sbin/bhyve/snapshot.c
===================================================================
--- usr.sbin/bhyve/snapshot.c
+++ usr.sbin/bhyve/snapshot.c
@@ -117,8 +117,6 @@
 
 #define	MAX_VMNAME 100
 
-#define	MAX_MSG_SIZE 1024
-
 #define	SNAPSHOT_BUFFER_SIZE (20 * MB)
 
 #define	JSON_STRUCT_ARR_KEY		"structs"
@@ -1442,24 +1440,10 @@
 }
 
 int
-get_checkpoint_msg(int conn_fd, struct vmctx *ctx)
+handle_message(struct checkpoint_op *checkpoint_op, struct vmctx *ctx)
 {
-	unsigned char buf[MAX_MSG_SIZE];
-	struct checkpoint_op *checkpoint_op;
-	int len, recv_len, total_recv = 0;
-	int err = 0;
-
-	len = sizeof(struct checkpoint_op); /* expected length */
-	while ((recv_len = recv(conn_fd, buf + total_recv, len - total_recv, 0)) > 0) {
-		total_recv += recv_len;
-	}
-	if (recv_len < 0) {
-		perror("Error while receiving data from bhyvectl");
-		err = -1;
-		goto done;
-	}
+	int err;
 
-	checkpoint_op = (struct checkpoint_op *)buf;
 	switch (checkpoint_op->op) {
 		case START_CHECKPOINT:
 			err = vm_checkpoint(ctx, checkpoint_op->snapshot_filename, false);
@@ -1472,8 +1456,9 @@
 			err = -1;
 	}
 
-done:
-	close(conn_fd);
+	if (err != 0)
+		fprintf(stderr, "Unable to perform the requested operation\n");
+
 	return (err);
 }
 
@@ -1483,21 +1468,24 @@
 void *
 checkpoint_thread(void *param)
 {
+	struct checkpoint_op op;
 	struct checkpoint_thread_info *thread_info;
-	int conn_fd, ret;
+	ssize_t n;
 
 	pthread_set_name_np(pthread_self(), "checkpoint thread");
 	thread_info = (struct checkpoint_thread_info *)param;
 
-	while ((conn_fd = accept(thread_info->socket_fd, NULL, NULL)) > -1) {
-		ret = get_checkpoint_msg(conn_fd, thread_info->ctx);
-		if (ret != 0) {
-			fprintf(stderr, "Failed to read message on checkpoint "
-					"socket. Retrying.\n");
-		}
-	}
-	if (conn_fd < -1) {
-		perror("Failed to accept connection");
+	for (;;) {
+		n = recvfrom(thread_info->socket_fd, &op, sizeof(op), 0, NULL, 0);
+
+		/*
+		 * slight sanity check: see if there's enough data to at
+		 * least determine the type of message.
+		 */
+		if (n >= sizeof(op.op))
+			handle_message(&op, thread_info->ctx);
+		else
+			fprintf(stderr, "Failed to receive message (IPC with bhyvectl)\n");
 	}
 
 	return (NULL);
@@ -1527,7 +1515,7 @@
 	if (err != 0)
 		errc(1, err, "checkpoint cv init");
 
-	socket_fd = socket(PF_UNIX, SOCK_STREAM, 0);
+	socket_fd = socket(PF_UNIX, SOCK_DGRAM, 0);
 	if (socket_fd < 0) {
 		perror("Socket creation failed (IPC with bhyvectl");
 		err = -1;
@@ -1553,12 +1541,6 @@
 		goto fail;
 	}
 
-	if (listen(socket_fd, 10) < 0) {
-		perror("Failed to listen on socket (IPC with bhyvectl)");
-		err = -1;
-		goto fail;
-	}
-
 	checkpoint_info = calloc(1, sizeof(*checkpoint_info));
 	checkpoint_info->ctx = ctx;
 	checkpoint_info->socket_fd = socket_fd;
Index: usr.sbin/bhyvectl/bhyvectl.c
===================================================================
--- usr.sbin/bhyvectl/bhyvectl.c
+++ usr.sbin/bhyvectl/bhyvectl.c
@@ -1687,11 +1687,11 @@
 send_checkpoint_op_req(struct vmctx *ctx, struct checkpoint_op *op)
 {
 	struct sockaddr_un addr;
-	int socket_fd, len, len_sent, total_sent;
-	int err = 0;
+	ssize_t len_sent;
+	int err, socket_fd;
 	char vmname_buf[MAX_VMNAME];
 
-	socket_fd = socket(PF_UNIX, SOCK_STREAM, 0);
+	socket_fd = socket(PF_UNIX, SOCK_DGRAM, 0);
 	if (socket_fd < 0) {
 		perror("Error creating bhyvectl socket");
 		err = -1;
@@ -1709,21 +1709,11 @@
 
 	snprintf(addr.sun_path, sizeof(addr.sun_path), "%s%s", BHYVE_RUN_DIR, vmname_buf);
 
-	if (connect(socket_fd, (struct sockaddr *)&addr,
-			sizeof(struct sockaddr_un)) != 0) {
-		perror("Connect to VM socket failed");
-		err = -1;
-		goto done;
-	}
-
-	len = sizeof(*op);
-	total_sent = 0;
-	while ((len_sent = send(socket_fd, (char *)op + total_sent, len - total_sent, 0)) > 0) {
-		total_sent += len_sent;
-	}
+	len_sent = sendto(socket_fd, op, sizeof(*op), 0,
+	    (struct sockaddr *)&addr, sizeof(struct sockaddr_un));
 
 	if (len_sent < 0) {
-		perror("Failed to send checkpoint operation request");
+		perror("Failed to send message to bhyve vm");
 		err = -1;
 	}