diff --git a/Vocaluxe/Lib/Input/CHIDAPI.cs b/Vocaluxe/Lib/Input/CHIDAPI.cs
index 7c761f8d..881beae3 100644
--- a/Vocaluxe/Lib/Input/CHIDAPI.cs
+++ b/Vocaluxe/Lib/Input/CHIDAPI.cs
@@ -47,7 +47,7 @@ namespace Vocaluxe.Lib.Input
 #endif
 
 #if LINUX
-        private const string _HIDApiDll = "libhidapi.so";
+        private const string _HIDApiDll = "libhidapi-libusb.so";
 #endif
 #endif
 
diff --git a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs
index a93f1b71..6df32553 100644
--- a/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs
+++ b/Vocaluxe/Lib/Video/Acinerella/CAcinerella.cs
@@ -176,7 +176,7 @@ namespace Vocaluxe.Lib.Video.Acinerella
 #endif
 
 #if LINUX
-        private const string _AcDll = "x86/libacinerella.so";
+        private const string _AcDll = "libacinerella.so";
 #endif
 #endif
 
diff --git a/makefile b/makefile
index d366dbe6..7f17fb92 100644
--- a/makefile
+++ b/makefile
@@ -1,9 +1,10 @@
+ARCH?=$(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x64/)
 windowsLibs = Output/gstreamer-sharp.dll Output/glib-sharp.dll
 all:
 	$(MAKE) -C PitchTracker
 	$(MAKE) -C Vocaluxe/Lib/Video/Acinerella
 	rm -f $(windowsLibs)
-	xbuild /property:Platform=x64 /property:Configuration=ReleaseLinux
+	xbuild /property:Platform=$(ARCH) /property:Configuration=ReleaseLinux
 
 clean:
 	xbuild /target:Clean