diff -Nru spectrwm-SPECTRWM_3_3_0.orig/linux/Makefile spectrwm-SPECTRWM_3_3_0/linux/Makefile
--- spectrwm-SPECTRWM_3_3_0.orig/linux/Makefile	2019-12-19 19:15:12.054168461 +0100
+++ spectrwm-SPECTRWM_3_3_0/linux/Makefile	2019-12-19 19:15:39.420060857 +0100
@@ -13,7 +13,7 @@
 
 MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
 MAINT_LDFLAGS  = -Wl,--as-needed
-MAINT_CPPFLAGS = -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
+MAINT_CPPFLAGS = -I. -D_GNU_SOURCE
 
 ifneq ("${BUILDVERSION}", "")
 MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
@@ -28,7 +28,7 @@
 LIB_CPPFLAGS = $(shell pkg-config --cflags x11)
 LIB_LDLIBS   = $(shell pkg-config --libs   x11) -ldl
 
-all: spectrwm libswmhack.so.$(LIBVERSION)
+all: spectrwm
 
 spectrwm: spectrwm.o linux.o
 	$(CC) $(MAINT_LDFLAGS) $(BIN_LDFLAGS) $(LDFLAGS) -o $@ $+ $(BIN_LDLIBS) $(LDLIBS)
diff -Nru spectrwm-SPECTRWM_3_3_0.orig/spectrwm.c spectrwm-SPECTRWM_3_3_0/spectrwm.c
--- spectrwm-SPECTRWM_3_3_0.orig/spectrwm.c	2019-12-19 19:15:12.054168461 +0100
+++ spectrwm-SPECTRWM_3_3_0/spectrwm.c	2019-12-19 19:15:39.420060857 +0100
@@ -295,9 +295,9 @@
 #define SWM_CONF_DEFAULT	(0)
 #define SWM_CONF_KEYMAPPING	(1)
 
-#ifndef SWM_LIB
+/* #ifndef SWM_LIB
 #define SWM_LIB			"/usr/local/lib/libswmhack.so"
-#endif
+#endif */
 
 char			**start_argv;
 xcb_atom_t		a_state;
@@ -4483,6 +4483,7 @@
 
 	close(xcb_get_file_descriptor(conn));
 
+	/*
 	if ((ret = getenv("LD_PRELOAD"))) {
 		if (asprintf(&ret, "%s:%s", SWM_LIB, ret) == -1) {
 			warn("spawn: asprintf LD_PRELOAD");
@@ -4493,6 +4494,7 @@
 	} else {
 		setenv("LD_PRELOAD", SWM_LIB, 1);
 	}
+	*/
 
 	if (asprintf(&ret, "%d", ws_idx) == -1) {
 		warn("spawn: asprintf SWM_WS");