diff --git a/hyper-v.changes b/hyper-v.changes
index 0a0f2a7..5b8e93c 100644
--- a/hyper-v.changes
+++ b/hyper-v.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 12 10:32:54 CET 2014 - ohering@suse.de
+
+- Update hv_fcopy_daemon, kernel name changed to /dev/vmbus/hv_fcopy
+
 -------------------------------------------------------------------
 Thu Jan 23 17:00:54 CET 2014 - ohering@suse.de
 
diff --git a/hyper-v.spec b/hyper-v.spec
index 70af620..4e73748 100644
--- a/hyper-v.spec
+++ b/hyper-v.spec
@@ -190,7 +190,7 @@ cat > ${d}/%{hv_vss_daemon}.rules <<EOF
 SUBSYSTEM=="vmbus", ACTION=="add", ATTR{class_id}=="{35fa2e29-ea23-4236-96ae-3a6ebacba440}", TAG+="systemd", ENV{SYSTEMD_WANTS}+="%{hv_vss_daemon}.service"
 EOF
 cat > ${d}/%{hv_fcopy_daemon}.rules <<EOF
-ACTION=="add", KERNEL=="hv_fcopy", TAG+="systemd", ENV{SYSTEMD_WANTS}+="%{hv_fcopy_daemon}.service"
+ACTION=="add", KERNEL=="vmbus/hv_fcopy", TAG+="systemd", ENV{SYSTEMD_WANTS}+="%{hv_fcopy_daemon}.service"
 EOF
 #
 head -n 42 ${d}/*.rules
diff --git a/hyper-v.tools.hv.hv_fcopy_daemon.c b/hyper-v.tools.hv.hv_fcopy_daemon.c
index b1b31b0..f5db03a 100644
--- a/hyper-v.tools.hv.hv_fcopy_daemon.c
+++ b/hyper-v.tools.hv.hv_fcopy_daemon.c
@@ -126,7 +126,7 @@ static int hv_copy_cancel(void)
 int main(void)
 {
 	int fd, fcopy_fd, len;
-	int error = 0;
+	int error;
 	int version = FCOPY_CURRENT_VERSION;
 	char *buffer[4096 * 2];
 	struct hv_fcopy_hdr *in_msg;
@@ -139,7 +139,7 @@ int main(void)
 	openlog("HV_FCOPY", 0, LOG_USER);
 	syslog(LOG_INFO, "HV_FCOPY starting; pid is:%d", getpid());
 
-	fcopy_fd = open("/dev/hv_fcopy", O_RDWR);
+	fcopy_fd = open("/dev/vmbus/hv_fcopy", O_RDWR);
 
 	if (fcopy_fd < 0) {
 		syslog(LOG_ERR, "open /dev/hv_fcopy failed; error: %d %s",
@@ -160,15 +160,10 @@ int main(void)
 		 * In this loop we process fcopy messages after the
 		 * handshake is complete.
 		 */
-
 		len = pread(fcopy_fd, buffer, (4096 * 2), 0);
-		if (len <= 0) {
-			if (!error) {
-				syslog(LOG_ERR, "Read error: %s",
-					 strerror(errno));
-				error = HV_E_FAIL;
-			}
-			continue;
+		if (len < 0) {
+			syslog(LOG_ERR, "pread failed: %s", strerror(errno));
+			exit(EXIT_FAILURE);
 		}
 		in_msg = (struct hv_fcopy_hdr *)buffer;