diff --git a/l2ork_addons/disis_wiimote/disis_wiimote.c b/l2ork_addons/disis_wiimote/disis_wiimote.c
index e85cb3a9e366cbec5efbb700d80aba740af04be4..ba61e4825cabc5743fe2b2afc6dc5c3bb2efac96 100644
--- a/l2ork_addons/disis_wiimote/disis_wiimote.c
+++ b/l2ork_addons/disis_wiimote/disis_wiimote.c
@@ -107,7 +107,7 @@
 #include <m_pd.h>
 #include <math.h>
 #include <pthread.h>
-#include <cwiid.h>
+#include "cwiid.h"
 #define PI	3.14159265358979323
 #define WIIMOTE_BALANCE_CALWEIGHT 17.0f
 #define HAVE_CWIID_MOTIONPLUS_LOWSPEED
diff --git a/l2ork_addons/disis_wiimote/makefile b/l2ork_addons/disis_wiimote/makefile
index 30bdf49d4d61e99d6f79e9eeca3a9ef5687f4bdd..8307089751fbc09d18d9d9995bdb3f74992ab8ab 100755
--- a/l2ork_addons/disis_wiimote/makefile
+++ b/l2ork_addons/disis_wiimote/makefile
@@ -4,11 +4,18 @@ SYM=disis_wiimote
 # If you want to use a customized Pd, then define a $PD_PATH variable.
 # Otherwise, the Pd must be installed on the system
 PD_PATH=../../pd
+# IMPORTANT! disis_wiimote requires a custom L2Ork version of cwiid library
+# For the time being we statically link to a L2Ork version of cwiid library
+# Change this paths if you are compiling disis_wiimote separately from
+# the rest of the pd-l2ork source to reflect the correct location of the
+# custom L2Ork version of the libcwiid
+CWIID_PATH=../cwiid
 
 ######################################################
 # You shouldn't need to change anything beyond here! #
 ######################################################
 
+CWIID_LIB_STATIC= $(CWIID_PATH)/libcwiid/libcwiid.a
 
 ifdef PD_PATH
 PD_INCLUDE := -I$(PD_PATH)/src
@@ -20,10 +27,10 @@ PD_EXTRA_PATH := /usr/local/lib/pd/extra
 PD_DOC_PATH := /usr/local/lib/pd/doc
 endif
 
-# we just use the cwiid that comes with ubuntu/hardy
-# although the code still uses the cwiid_internal.h from the 
-# supplied source		
-LIBS = -lcwiid -lbluetooth -lpthread
+# we use custom version of cwiid so for the time being we statically link to it	
+LIBS = $(CWIID_LIB_STATIC) -lbluetooth -lpthread
+# later
+#LIBS = -lcwiid -lbluetooth -lpthread
 #LIBS = $(CWIID_PATH)/libcwiid/libcwiid.a -lrt -lbluetooth -lpthread
 
 
diff --git a/l2ork_addons/tar_em_up.sh b/l2ork_addons/tar_em_up.sh
index 359f6c8defab2ddbda5e8948dbed9287164ee89c..a514f0b2c9d30659ec8c235d33adeb6356f66290 100755
--- a/l2ork_addons/tar_em_up.sh
+++ b/l2ork_addons/tar_em_up.sh
@@ -170,21 +170,24 @@ then
 	cp -f ../l2ork_addons/doc/Makefile .
 	cd ..
 
-	if [ $full -eq 2 -o $deb -eq 2 ]
+	if [ $full -eq 2 -o $full -eq 3 -o $deb -eq 2 ]
 	then
 	#	echo "Since we are doing a complete recompile we are assuming we will need to install l2ork version of the cwiid library. You will need to remove any existing cwiid libraries manually as they will clash with this one. L2Ork version is fully backwards compatible while also offering unique features like full extension support including the passthrough mode. YOU SHOULD REMOVE EXISTING CWIID LIBRARIES PRIOR TO RUNNING THIS INSTALL... You will also have to enter sudo password to install these... Press any key to continue or CTRL+C to cancel install..."
 	#	read dummy
-		if [ $no_cwiid -eq 0 ]
-		then
+	#	if [ $no_cwiid -eq 0 ]
+	#	then
 			cd l2ork_addons/cwiid/
 			# install cwiid
 			aclocal
 			autoconf
 			./configure
 			make
-			sudo make install
+			# we have disabled system-wide install because as of 23-03-2013
+			# we now statically link disis_wiimote against custom L2Ork version
+			# of the cwiid library
+			# sudo make install
 			cd ../../
-		fi
+	#	fi
 		# clean files that may remain stuck even after doing global make clean (if any)
 		cd externals/miXed
 		make clean
@@ -198,29 +201,29 @@ then
 		rm Gem.pd_linux
 		aclocal
 		./autogen.sh
-	elif [ $full -eq 3 ]
-	then
-		echo "Since pd-l2ork relies on a unique version of cwiid library, we will need to install it to make disis_wiimote external work properly. YOU SHOULD REMOVE EXISTING CWIID LIBRARIES PRIOR TO RUNNING THIS INSTALL... No worries though, L2Ork version is fully backwards compatible while also offering unique features like full extension support including the passthrough mode. To install cwiid library go to <pd-l2ork-root-git-folder>/l2ork-addons/cwiid/ folder and install it using the usual:"
-		echo
-		echo "./configure"
-		echo "make"
-		echo "sudo make install"
-		echo
-		echo "As an alternative, you can also use the -f or -F options instead of an -u option to have this performed automatically. Please note that options -f and -F require that your system has sudo enabled. Press any key to continue or CTRL+C to cancel install..."
-		read dummy
+	#elif [ $full -eq 3 ]
+	#then
+	#	echo "Since pd-l2ork relies on a unique version of cwiid library, we will need to install it to make disis_wiimote external work properly. YOU SHOULD REMOVE EXISTING CWIID LIBRARIES PRIOR TO RUNNING THIS INSTALL... No worries though, L2Ork version is fully backwards compatible while also offering unique features like full extension support including the passthrough mode. To install cwiid library go to <pd-l2ork-root-git-folder>/l2ork-addons/cwiid/ folder and install it using the usual:"
+	#	echo
+	#	echo "./configure"
+	#	echo "make"
+	#	echo "sudo make install"
+	#	echo
+	#	echo "As an alternative, you can also use the -f or -F options instead of an -u option to have this performed automatically. Please note that options -f and -F require that your system has sudo enabled. Press any key to continue or CTRL+C to cancel install..."
+	#	read dummy
 		# clean files that may remain stuck even after doing global make clean (if any)
-		cd externals/miXed
-		make clean
-		cd ../../Gem/src/
-		make distclean
-		rm -rf ./.libs
-		rm -rf ./*/.libs
-		cd ../
-		make distclean
-		rm gemglutwindow.pd_linux
-		rm Gem.pd_linux
-		aclocal
-		./autogen.sh
+	#	cd externals/miXed
+	#	make clean
+	#	cd ../../Gem/src/
+	#	make distclean
+	#	rm -rf ./.libs
+	#	rm -rf ./*/.libs
+	#	cd ../
+	#	make distclean
+	#	rm gemglutwindow.pd_linux
+	#	rm Gem.pd_linux
+	#	aclocal
+	#	./autogen.sh
 	else
 		cd Gem/
 	fi