diff --git a/source/backend/engine/CarlaEngineJack.cpp b/source/backend/engine/CarlaEngineJack.cpp
index 485df2c6e..f3542bb9d 100644
--- a/source/backend/engine/CarlaEngineJack.cpp
+++ b/source/backend/engine/CarlaEngineJack.cpp
@@ -871,6 +871,11 @@ public:
 #ifdef BUILD_BRIDGE
         client = fClient = jackbridge_client_open(plugin->name(), JackNullOption, nullptr);
 
+        CARLA_ASSERT(client != nullptr);
+
+        if (client == nullptr)
+            return nullptr;
+
         fBufferSize = jackbridge_get_buffer_size(client);
         fSampleRate = jackbridge_get_sample_rate(client);
 
diff --git a/source/libs/jackbridge/JackBridge2.cpp b/source/libs/jackbridge/JackBridge2.cpp
index 95e240127..3bd6925d3 100644
--- a/source/libs/jackbridge/JackBridge2.cpp
+++ b/source/libs/jackbridge/JackBridge2.cpp
@@ -50,15 +50,16 @@ bool jackbridge_sem_timedwait(void*, int)
 
 #include <semaphore.h>
 
-//#ifdef __WINE__
-//# define _STRUCT_TIMEVAL 1
-//# define _SYS_SELECT_H   1
-//# include <bits/types.h>
-//struct timespec {
+// #ifdef __WINE__
+// # warning Using Wine
+// # define _STRUCT_TIMEVAL 1
+// # define _SYS_SELECT_H   1
+// # include <bits/types.h>
+// struct timespec {
 //    __time_t tv_sec;  /* Seconds.     */
 //    long int tv_nsec; /* Nanoseconds. */
-//};
-//#endif
+// };
+// #endif
 
 #ifdef CARLA_OS_WIN
 # include <sys/time.h>
diff --git a/source/libs/jackbridge/Makefile b/source/libs/jackbridge/Makefile
index 7fe034a3a..1210b80bb 100644
--- a/source/libs/jackbridge/Makefile
+++ b/source/libs/jackbridge/Makefile
@@ -24,10 +24,10 @@ WIN_32BIT_FLAGS  = $(32BIT_FLAGS)
 WIN_64BIT_FLAGS  = $(64BIT_FLAGS)
 WIN_LINK_FLAGS   = $(LINK_FLAGS)
 
-WINE_BUILD_FLAGS = $(BUILD_CXX_FLAGS) -DJACKBRIDGE_DIRECT=1 -fPIC
+WINE_BUILD_FLAGS = $(BUILD_CXX_FLAGS) -fPIC
 WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wine
 WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine
-WINE_LINK_FLAGS  = $(LINK_FLAGS) -ldl -lrt -lpthread -ljack
+WINE_LINK_FLAGS  = $(LINK_FLAGS) -ldl -lrt -lpthread
 
 OBJS    = JackBridge1.cpp   JackBridge2.cpp
 OBJSw32 = JackBridge1.w32.o JackBridge2.w32.o
@@ -58,10 +58,10 @@ JackBridge%.w64.o: JackBridge%.cpp
 ../jackbridge-win64.dll: $(OBJS)
 	$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) $(WIN_LINK_FLAGS) -Wl,--output-def,$@.def,--out-implib,$@.a -o $@ $(CMD_STRIP) $@
 
-../jackbridge-win32.dll.so: JackBridge1.cpp JackBridge2.cpp ../jackbridge-win32.dll.def
-	$(WINECXX) $^ $(WIN_BUILD_FLAGS) $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -mno-cygwin -o $@ $(CMD_STRIP) $@
+../jackbridge-win32.dll.so: $(OBJSw32) ../jackbridge-win32.dll.def
+	$(WINECXX) $^ $(WINE_32BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@ $(CMD_STRIP) $@
 
-../jackbridge-win64.dll.so: JackBridge1.cpp JackBridge2.cpp ../jackbridge-win64.dll.def
-	$(WINECXX) $^ $(WIN_BUILD_FLAGS) $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -mno-cygwin -o $@ $(CMD_STRIP) $@
+../jackbridge-win64.dll.so: $(OBJS) ../jackbridge-win64.dll.def
+	$(WINECXX) $^ $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) -o $@ $(CMD_STRIP) $@
 
 # --------------------------------------------------------------