diff -ur telldus-core-2.1.2/client/CMakeLists.txt telldus-core-2.1.2-lunar/client/CMakeLists.txt
--- telldus-core-2.1.2/client/CMakeLists.txt	2014-03-31 12:30:09.000000000 +0200
+++ telldus-core-2.1.2-lunar/client/CMakeLists.txt	2015-01-17 18:02:31.918058230 +0100
@@ -4,6 +4,9 @@
 
 FIND_PACKAGE( SignTool REQUIRED )
 
+SET(CMAKE_C_FLAGS "-pthread")
+SET(CMAKE_CXX_FLAGS "-pthread")
+
 ######## Non configurable options  ########
 SET( telldus-core_SRCS
 	CallbackDispatcher.cpp
diff -ur telldus-core-2.1.2/common/Socket.h telldus-core-2.1.2-lunar/common/Socket.h
--- telldus-core-2.1.2/common/Socket.h	2014-03-31 12:30:09.000000000 +0200
+++ telldus-core-2.1.2-lunar/common/Socket.h	2015-01-17 18:15:52.303242418 +0100
@@ -11,6 +11,7 @@
 	#include <windows.h>
 	typedef HANDLE SOCKET_T;
 #else
+	#include <unistd.h>
 	typedef int SOCKET_T;
 #endif
 
diff -ur telldus-core-2.1.2/service/tellstick.conf telldus-core-2.1.2-lunar/service/tellstick.conf
--- telldus-core-2.1.2/service/tellstick.conf	2014-03-31 12:30:09.000000000 +0200
+++ telldus-core-2.1.2-lunar/service/tellstick.conf	2015-01-17 18:10:23.501318044 +0100
@@ -1,5 +1,5 @@
-user = "nobody"
-group = "plugdev"
+user = "tellstick"
+group = "uucp"
 ignoreControllerConfirmation = "false"
 device {
   id = 1
diff -ur telldus-core-2.1.2/tdadmin/05-tellstick.rules telldus-core-2.1.2-lunar/tdadmin/05-tellstick.rules
--- telldus-core-2.1.2/tdadmin/05-tellstick.rules	2014-03-31 12:30:09.000000000 +0200
+++ telldus-core-2.1.2-lunar/tdadmin/05-tellstick.rules	2015-01-17 18:09:24.542169596 +0100
@@ -1,3 +1,3 @@
-ATTRS{idVendor}=="1781", SUBSYSTEM=="usb", ACTION=="add", MODE="664", GROUP="plugdev", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}", ENV{ID_SERIAL_SHORT}="$attr{serial}", RUN+="@CMAKE_INSTALL_PREFIX@/share/telldus-core/helpers/udev.sh"
+ATTRS{idVendor}=="1781", SUBSYSTEM=="usb", ACTION=="add", MODE="664", GROUP="uucp", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}", ENV{ID_SERIAL_SHORT}="$attr{serial}", RUN+="@CMAKE_INSTALL_PREFIX@/share/telldus-core/helpers/udev.sh"
 ENV{ID_VENDOR_ID}=="1781", SUBSYSTEM=="usb", ACTION=="remove", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}", ENV{ID_SERIAL_SHORT}="$attr{serial}", RUN+="@CMAKE_INSTALL_PREFIX@/share/telldus-core/helpers/udev.sh"
-
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="uucp"
diff -ur telldus-core-2.1.2/tdadmin/CMakeLists.txt telldus-core-2.1.2-lunar/tdadmin/CMakeLists.txt
--- telldus-core-2.1.2/tdadmin/CMakeLists.txt	2014-03-31 12:30:09.000000000 +0200
+++ telldus-core-2.1.2-lunar/tdadmin/CMakeLists.txt	2015-01-17 18:12:36.219402528 +0100
@@ -59,7 +59,7 @@
 INSTALL(TARGETS tdadmin RUNTIME DESTINATION sbin)
 
 IF (UNIX AND NOT APPLE)
-	SET(UDEV_RULES_DIR	"/etc/udev/rules.d" CACHE PATH "The directory where udev store its rules" )
+	SET(UDEV_RULES_DIR	"/usr/lib/udev/rules.d" CACHE PATH "The directory where udev store its rules" )
 	CONFIGURE_FILE(
 		${CMAKE_CURRENT_SOURCE_DIR}/05-tellstick.rules
 		${CMAKE_BINARY_DIR}/parsed/05-tellstick.rules