diff --git a/Makefile b/Makefile
index 30d5111..69744bb 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@ install:
 	install bin/* ${DESTDIR}/${PREFIX}/bin
 	install -d ${DESTDIR}/${PREFIX}/sbin
 	install sbin/* ${DESTDIR}/${PREFIX}/sbin
-	install -d ${DESTDIR}/${PREFIX}/lib64
-	install lib64/*.so ${DESTDIR}/${PREFIX}/lib64
+	install -d ${DESTDIR}/${PREFIX}/lib
+	install lib/*.so ${DESTDIR}/${PREFIX}/lib
 	install -d ${DESTDIR}/${PREFIX}/lib/snail
 	install -d ${DESTDIR}/${PREFIX}/share
 	install -d ${DESTDIR}/${PREFIX}/share/snail
@@ -21,9 +21,9 @@ install:
 uninstall:
 	rm -f ${DESTDIR}/etc/X11/xorg.conf.*.snail
 	rm -f ${DESTDIR}/etc/init.d/snail*
-	rm -f ${DESTDIR}/${PREFIX}/lib64/libdlfaker.so
-	rm -f ${DESTDIR}/${PREFIX}/lib64/libgefaker.so
-	rm -f ${DESTDIR}/${PREFIX}/lib64/librrfaker.so
+	rm -f ${DESTDIR}/${PREFIX}/lib/libdlfaker.so
+	rm -f ${DESTDIR}/${PREFIX}/lib/libgefaker.so
+	rm -f ${DESTDIR}/${PREFIX}/lib/librrfaker.so
 	rm -rf ${DESTDIR}/${PREFIX}/lib/snail
 	rm -rf ${DESTDIR}/${PREFIX}/share/snail
 	rm -f ${DESTDIR}/${PREFIX}/bin/nvrun
diff --git a/sbin/snail.configure b/sbin/snail.configure
index 0d413f5..11376d1 100755
--- a/sbin/snail.configure
+++ b/sbin/snail.configure
@@ -163,8 +163,18 @@ case "$DISTRIB_ID" in
         fi
       ;;
 
-      "wheezy")
+      wheezy*)
+          rm -f /etc/alternatives/glx--libGL.so.1-x86_64-linux-gnu
+          ln -sf /usr/lib/mesa-diverted/x86_64-linux-gnu/libGL.so.1 /etc/alternatives/glx--libGL.so.1-x86_64-linux-gnu
+          rm -f /etc/alternatives/glx--linux-libglx.so
+          ln -sf /usr/lib/xorg/modules/extensions/libglx.so /etc/alternatives/glx--linux-libglx.so
 
+          ln -sf /usr/lib/xorg/modules/libfb.so /usr/lib/snail/libfb.so
+          ln -sf /usr/lib/xorg/modules/libwfb.so /usr/lib/snail/libwfb.so
+
+          ln -sf /usr/lib/x86_64-linux-gnu/nvidia/current/libGL.so.1 /usr/lib/snail/libGL.so.1
+          ln -sf /etc/alternatives/nvidia/libglx.so /usr/lib/snail/libglx.so
+          ln -sf /usr/lib/nvidia/nvidia/nvidia_drv.so /usr/lib/snail/nvidia_drv.so
       ;;
 
       *)