diff --git a/CMakeLists.txt b/CMakeLists.txt
index a459e06..9aa8895 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(moonlight-embedded C)
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 2.8)
 SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 include(${CMAKE_ROOT}/Modules/GNUInstallDirs.cmake)
 
@@ -32,11 +32,11 @@ pkg_check_modules(PULSE libpulse-simple)
 
 if(AVCODEC_FOUND AND AVUTIL_FOUND AND SWSCALE_FOUND AND SDL_FOUND)
   set(SOFTWARE_FOUND TRUE)
-  if(XLIB_FOUND AND LIBVA_FOUND)
-    set(VDPAU_FOUND TRUE)
-  else()
+#  if(XLIB_FOUND AND LIBVA_FOUND)
+#    set(VDPAU_FOUND TRUE)
+#  else()
     set(VDPAU_FOUND FALSE)
-  endif()
+#  endif()
 else()
   set(SOFTWARE_FOUND FALSE)
 endif()
@@ -84,7 +84,7 @@ add_subdirectory(libgamestream)
 
 add_executable(moonlight ${SRC_LIST})
 target_link_libraries(moonlight gamestream)
-set_property(TARGET moonlight PROPERTY C_STANDARD 99)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
 
 if (CEC_FOUND AND CEC_VERSION_COMPATIBLE)
   list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC)
@@ -98,7 +98,7 @@ if(BROADCOM_FOUND)
   list(APPEND MOONLIGHT_OPTIONS PI)
   aux_source_directory(./third_party/ilclient ILCLIENT_SRC_LIST)
   add_library(moonlight-pi SHARED ./src/video/pi.c ${ILCLIENT_SRC_LIST})
-  target_include_directories(moonlight-pi PRIVATE ./third_party/ilclient ${BROADCOM_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR})
+  include_directories(./third_party/ilclient ${BROADCOM_INCLUDE_DIRS})
   target_link_libraries(moonlight-pi gamestream ${BROADCOM_LIBRARIES})
   set_property(TARGET moonlight-pi PROPERTY COMPILE_DEFINITIONS ${BROADCOM_DEFINITIONS})
   install(TARGETS moonlight-pi DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/debian/changelog b/debian/changelog
index a65b575..1e19229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-moonlight-embedded (2.1.2-1) RELEASED; urgency=high
+moonlight-embedded (2.1.2-2) RELEASED; urgency=high
 
   * Update to version 2.1.2
 
diff --git a/debian/control b/debian/control
index 4c67df4..d9f7a1c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: moonlight-embedded
 Section: games
 Priority: extra
 Maintainer: Iwan Timmer <irtimmer@gmail.com>
-Build-Depends: debhelper (>= 8.0.0), cmake, libopus-dev, libexpat1-dev, libasound2-dev, libudev-dev, libavahi-client-dev, libcurl4-openssl-dev, libevdev-dev, libraspberrypi-dev | rbp-userland-dev-osmc
+Build-Depends: debhelper (>= 8.0.0), cmake, libopus-dev, libexpat1-dev, libasound2-dev, libudev-dev, libavahi-client-dev, libcurl4-openssl-dev, libevdev-dev
 Standards-Version: 3.9.3
 Homepage: https://github.com/irtimmer/moonlight-embedded
 
 Package: moonlight-embedded
 Architecture: armhf
-Depends: libraspberrypi0 | rbp-userland-osmc, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: alsa-base
 Suggests: alsa-utils
 Description: GameStream client for Linux
diff --git a/debian/rules b/debian/rules
index 16fe403..d92ed13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 %:
-	dh $@ --with quilt
+	dh $@
diff --git a/libgamestream/CMakeLists.txt b/libgamestream/CMakeLists.txt
index fea8e5d..40237df 100644
--- a/libgamestream/CMakeLists.txt
+++ b/libgamestream/CMakeLists.txt
@@ -14,13 +14,13 @@ aux_source_directory(../third_party/moonlight-common-c/limelight-common/OpenAES
 add_library(moonlight-common SHARED ${MOONLIGHT_COMMON_SRC_LIST})
 
 add_library(gamestream SHARED ${GAMESTREAM_SRC_LIST})
-set_property(TARGET gamestream PROPERTY C_STANDARD 99)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
 target_link_libraries(gamestream moonlight-common)
 
 set_target_properties(gamestream PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION})
 set_target_properties(moonlight-common PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION})
 
-target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS})
+include_directories(../third_party/h264bitstream ../third_party/moonlight-common-c ${AVAHI_INCLUDE_DIRS})
 target_link_libraries(gamestream ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${AVAHI_LIBRARIES})
 
 target_link_libraries(gamestream ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
diff --git a/src/sdl.c b/src/sdl.c
index b48999e..844e1c6 100644
--- a/src/sdl.c
+++ b/src/sdl.c
@@ -39,7 +39,7 @@ void sdl_init(int width, int height, bool fullscreen) {
     exit(1);
   }
 
-  fullscreen_flags = fullscreen?SDL_WINDOW_FULLSCREEN:0;
+  fullscreen_flags = fullscreen?SDL_WINDOW_FULLSCREEN_DESKTOP:0;
   window = SDL_CreateWindow("Moonlight", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, SDL_WINDOW_OPENGL | fullscreen_flags);
   if(!window) {
     fprintf(stderr, "SDL: could not create window - exiting\n");
@@ -53,6 +53,10 @@ void sdl_init(int width, int height, bool fullscreen) {
     exit(1);
   }
 
+  SDL_RendererInfo info;
+  SDL_GetRendererInfo(renderer,&info);
+  fprintf(stdout, "Renderer = %s\n",info.name);
+
   bmp = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_YV12, SDL_TEXTUREACCESS_STREAMING, width, height);
   if (!bmp) {
     fprintf(stderr, "SDL: could not create texture - exiting\n");
@@ -65,7 +69,6 @@ void sdl_init(int width, int height, bool fullscreen) {
     exit(1);
   }
 
-
   sdlinput_init();
 }
 
@@ -77,7 +80,7 @@ void sdl_loop() {
       done = true;
       break;
     case SDL_TOGGLE_FULLSCREEN:
-      fullscreen_flags ^= SDL_WINDOW_FULLSCREEN;
+      fullscreen_flags ^= SDL_WINDOW_FULLSCREEN_DESKTOP;
       SDL_SetWindowFullscreen(window, fullscreen_flags);
     case SDL_MOUSE_GRAB:
       SDL_SetRelativeMouseMode(SDL_TRUE);