diff -up ./Platform/Linux/Build/Common/CommonCppMakefile.fedora ./Platform/Linux/Build/Common/CommonCppMakefile
--- ./Platform/Linux/Build/Common/CommonCppMakefile.fedora	2014-06-01 16:14:48.787069665 -0400
+++ ./Platform/Linux/Build/Common/CommonCppMakefile	2014-06-01 16:15:21.350346455 -0400
@@ -71,6 +71,9 @@ endif
 CFLAGS += $(INC_DIRS_OPTION) $(DEFINES_OPTION)
 LDFLAGS += $(LIB_DIRS_OPTION) $(USED_LIBS_OPTION)
 
+CFLAGS += $(CFLAGS_EXT)
+LDFLAGS += $(LDFLAGS_EXT)
+
 # some lib / exe specifics
 ifneq "$(LIB_NAME)" ""
 	OUTPUT_NAME = lib$(LIB_NAME).so
diff -up ./Platform/Linux/Build/XnFormats/Makefile.fedora ./Platform/Linux/Build/XnFormats/Makefile
--- ./Platform/Linux/Build/XnFormats/Makefile.fedora	2014-06-01 16:15:46.050315034 -0400
+++ ./Platform/Linux/Build/XnFormats/Makefile	2014-06-01 16:16:41.941505586 -0400
@@ -1,10 +1,15 @@
 SRC_FILES = \
-			../../../../Source/XnFormats/*.cpp \
-			../../../../Source/External/LibJPEG/*.c
+			../../../../Source/XnFormats/*.cpp 
 
 LIB_NAME = XnFormats
 USED_LIBS = XnCore OpenNI
 DEFINES = XN_FORMATS_EXPORTS
-INC_DIRS = ../../../../Source/External/LibJPEG
+
+ifneq ($(wildcard /usr/include/jpeglib.h /usr/local/include/jpeglib.h),)
+  USED_LIBS += jpeg
+else
+  INC_DIRS  += ../../../../Source/External/LibJPEG
+  SRC_FILES += ../../../../Source/External/LibJPEG/*.c
+endif
 
 include ../EngineLibMakefile
diff -up ./Platform/Linux/CreateRedist/install.sh.fedora ./Platform/Linux/CreateRedist/install.sh
--- ./Platform/Linux/CreateRedist/install.sh.fedora	2014-06-01 16:17:06.993486111 -0400
+++ ./Platform/Linux/CreateRedist/install.sh	2014-06-01 16:22:09.136315277 -0400
@@ -8,6 +8,8 @@ Installs PrimeSense Sensor Driver to cur
 	Installs PrimeSense Sensor Driver (default mode)
 -u,--uninstall
 	Uninstalls PrimeSense Sensor Driver.
+-n,--no-register
+	Do not register with OpenNI
 -c,--cross-compile-rootfs <path>
 	Used for cross-compiling. Installs PrimeSense Sensor Driver to <path> instead of '/'.
 -h,--help
@@ -34,6 +36,7 @@ LIB_FILES=`ls $SCRIPT_DIR/Lib/*`
 BIN_FILES=`ls $SCRIPT_DIR/Bin/*`
 
 rootfs=
+register=yes
 
 # parse command line
 while [ "$1" ]; do
@@ -44,6 +47,9 @@ while [ "$1" ]; do
 	-u|--uninstall)
 		uninstall=yes
 		;;
+	-n|--no-register)
+		register=no
+		;;
 	-c|--cross-staging-dir)
 		shift
 		rootfs=$1
@@ -70,11 +76,22 @@ if [ "$install" = yes ] && [ "$uninstall
 	exit 1
 fi
 
-INSTALL_LIB=$rootfs/usr/lib
-INSTALL_BIN=$rootfs/usr/bin
-INSTALL_ETC=$rootfs/usr/etc/primesense
-INSTALL_RULES=$rootfs/etc/udev/rules.d
-SERVER_LOGS_DIR=$rootfs/var/log/primesense/XnSensorServer
+if [ -z "$INSTALL_LIB" ]; then
+  INSTALL_LIB=$rootfs/usr/lib
+fi
+if [ -z "$INSTALL_BIN" ]; then
+  INSTALL_BIN=$rootfs/usr/bin
+fi
+if [ -z "$INSTALL_ETC" ]; then
+  INSTALL_ETC=$rootfs/usr/etc/primesense
+fi
+if [ -z "$INSTALL_RULES" ]; then
+  INSTALL_RULES=$rootfs/etc/udev/rules.d
+fi
+if [ -z "$SERVER_LOGS_DIR" ]; then
+  SERVER_LOGS_DIR=$rootfs/var/log/primesense
+fi
+
 
 # make all calls into OpenNI run in this filesystem
 export OPEN_NI_INSTALL_PATH=$rootfs
@@ -92,6 +109,7 @@ if [ "$install" = yes ]; then
 
     # Copy shared libraries
     printf "copying shared libraries..."
+    mkdir -p $INSTALL_LIB
     cp $LIB_FILES $INSTALL_LIB
     printf "OK\n"
 
@@ -101,21 +119,26 @@ if [ "$install" = yes ]; then
     printf "OK\n"
 
     # register modules
-    for module in $MODULES; do
-        printf "registering module '$module' with OpenNI..."
+    if [ "$register" == "yes" ]; then
+        for module in $MODULES; do
+            printf "registering module '$module' with OpenNI..."
 		$INSTALL_BIN/niReg -r $INSTALL_LIB/$module $INSTALL_ETC
-        printf "OK\n"
-    done
+            printf "OK\n"
+        done
+    fi
 
     # copy config file
     printf "copying server config file..."
+    mkdir -p $INSTALL_ETC
     cp Config/GlobalDefaults.ini $INSTALL_ETC
     printf "OK\n"
 
     # make server run as root
     printf "setting uid of server..."
-    chown root $INSTALL_BIN/XnSensorServer
-    chmod +s $INSTALL_BIN/XnSensorServer
+    if [ "$register" == "yes" ]; then
+        chown root $INSTALL_BIN/XnSensorServer
+        chmod +s $INSTALL_BIN/XnSensorServer
+    fi
     printf "OK\n"
 
     # create server log dir
@@ -139,13 +162,15 @@ elif [ "$uninstall" = yes ]; then
 	printf "Uninstalling PrimeSense Sensor\n"
 	printf "******************************\n\n"
 
-    # unregister modules
-    for module in $MODULES; do
-    	printf "unregistering module '$module' from OpenNI..."
-        if $INSTALL_BIN/niReg -u $INSTALL_LIB/$module; then
-            printf "OK\n"
-        fi
-    done
+    if [ "$register" == "yes" ]; then
+        # unregister modules
+        for module in $MODULES; do
+        	printf "unregistering module '$module' from OpenNI..."
+            if $INSTALL_BIN/niReg -u $INSTALL_LIB/$module; then
+                printf "OK\n"
+            fi
+        done
+    fi
 
     # delete shared libraries
     printf "removing shared libraries..."
diff -up ./Source/XnFormats/XnStreamCompression.h.fedora ./Source/XnFormats/XnStreamCompression.h
--- ./Source/XnFormats/XnStreamCompression.h.fedora	2014-06-01 16:22:24.271908053 -0400
+++ ./Source/XnFormats/XnStreamCompression.h	2014-06-01 16:22:38.607469258 -0400
@@ -26,7 +26,7 @@
 //---------------------------------------------------------------------------
 #include "XnFormats.h"
 #include <XnOS.h>
-#include <External/LibJPEG/jpeglib.h>
+#include <jpeglib.h>
 #include <setjmp.h>
 
 //---------------------------------------------------------------------------