Index: biosdevname-0.6.1/src/bios_dev_name.c
===================================================================
--- biosdevname-0.6.1.orig/src/bios_dev_name.c
+++ biosdevname-0.6.1/src/bios_dev_name.c
@@ -114,10 +114,21 @@ static u_int32_t
 cpuid (u_int32_t eax, u_int32_t ecx)
 {
     asm volatile (
-        "xor %%ebx, %%ebx; cpuid"
+#ifdef x86_64
+    	"pushl %%rbx\n"
+#else
+    	"push %%ebx\n"
+#endif
+        "xor %%ebx, %%ebx\n"
+	"cpuid\n"
+#ifdef x86_64
+	"popl %%rbx\n"
+#else
+	"pop %%ebx\n"
+#endif
         : "=a" (eax),  "=c" (ecx)
         : "a" (eax)
-	: "%ebx", "%edx");
+	: "%edx");
     return ecx;
 }