diff --git a/debian/changelog b/debian/changelog
index 27fad92..415635f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+moonlight-embedded (2.1.0-1) UNRELEASED; urgency=low
+
+  * Support OSMC
+  * Update Moonlight-embedded to version 2.1.0
+
+ -- Iwan Timmer <irtimmer@gmail.com>  Sat, 7 Jul 2015 19:05:48 +0000
+
 moonlight-embedded (2.0.2-1) UNRELEASED; urgency=low
 
   * More (untested) gamepad mappings included
diff --git a/debian/patches/install.patch b/debian/patches/install.patch
index 24fe372..c1a5c48 100644
--- a/debian/patches/install.patch
+++ b/debian/patches/install.patch
@@ -1,34 +1,77 @@
 Compile using older version (2.8) of CMake
 Index: moonlight-embedded/CMakeLists.txt
 ===================================================================
---- moonlight-embedded.orig/CMakeLists.txt	2015-06-20 14:01:58.000000000 +0000
-+++ moonlight-embedded/CMakeLists.txt	2015-07-07 19:36:52.000000000 +0000
+--- moonlight-embedded.orig/CMakeLists.txt	2015-08-14 14:05:22.000000000 +0000
++++ moonlight-embedded/CMakeLists.txt	2015-08-14 14:06:06.000000000 +0000
 @@ -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)
  
-@@ -50,18 +50,18 @@
+@@ -53,11 +53,11 @@
  
- if(BROADCOM_FOUND)
-   include_directories(./third_party/ilclient ./third_party/h264bitstream ${BROADCOM_INCLUDE_DIRS})
--  target_link_libraries (moonlight PUBLIC ${BROADCOM_LIBRARIES})
-+  target_link_libraries (moonlight ${BROADCOM_LIBRARIES})
-   list(APPEND MOONLIGHT_DEFINITIONS ${BROADCOM_DEFINITIONS})
+ 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)
+-  target_include_directories(moonlight PRIVATE ./third_party/libcec ${CEC_INCLUDE_DIRS}/libcec)
++  include_directories(./third_party/libcec ${CEC_INCLUDE_DIRS}/libcec)
+   target_link_libraries(moonlight ${CEC_LIBRARIES})
  endif()
  
+@@ -65,7 +65,7 @@
+   list(APPEND MOONLIGHT_DEFINITIONS HAVE_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})
+@@ -74,18 +74,18 @@
  if(FREESCALE_FOUND)
-   include_directories(${FREESCALE_INCLUDE_DIRS})
--  target_link_libraries (moonlight PUBLIC ${FREESCALE_LIBRARIES})
-+  target_link_libraries (moonlight ${FREESCALE_LIBRARIES})
+   list(APPEND MOONLIGHT_DEFINITIONS HAVE_IMX)
+   add_library(moonlight-pi SHARED ./src/video/imx.c)
+-  target_include_directories(moonlight-imx PRIVATE ./third_party/ilclient ${FREESCALE_INCLUDE_DIRS} ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR})
++  include_directories(${FREESCALE_INCLUDE_DIRS})
+   target_link_libraries(moonlight-imx gamestream ${FREESCALE_LIBRARIES})
+   install(TARGETS moonlight-imx DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+ if (${SOFTWARE_FOUND})
+-  target_include_directories(moonlight PRIVATE ${SDL_INCLUDE_DIRS} ${AVCODEC_INCLUDE_DIRS} ${AVUTIL_INCLUDE_DIRS} ${SWSCALE_INCLUDE_DIRS})
++  include_directories(${SDL_INCLUDE_DIRS} ${AVCODEC_INCLUDE_DIRS} ${AVUTIL_INCLUDE_DIRS} ${SWSCALE_INCLUDE_DIRS})
+   target_link_libraries(moonlight ${SDL_LIBRARIES} ${AVCODEC_LIBRARIES} ${AVUTIL_LIBRARIES} ${SWSCALE_LIBRARIES})
  endif()
  
  set_property(TARGET moonlight PROPERTY COMPILE_DEFINITIONS ${MOONLIGHT_DEFINITIONS})
- include_directories(./third_party/moonlight-common-c ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${AVAHI_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS} ${CEC_INCLUDE_DIRS})
--target_link_libraries (moonlight PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${EVDEV_LIBRARIES} ${ALSA_LIBRARY} ${OPUS_LIBRARY} ${AVAHI_LIBRARIES} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS} ${CEC_LIBRARIES})
-+target_link_libraries (moonlight ${CMAKE_THREAD_LIBS_INIT} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${EVDEV_LIBRARIES} ${ALSA_LIBRARY} ${OPUS_LIBRARY} ${AVAHI_LIBRARIES} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS} ${CEC_LIBRARIES})
+-target_include_directories(moonlight PRIVATE ${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR} ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS})
++include_directories(${GAMESTREAM_INCLUDE_DIR} ${MOONLIGHT_COMMON_INCLUDE_DIR} ${OPUS_INCLUDE_DIRS} ${EVDEV_INCLUDE_DIRS} ${UDEV_INCLUDE_DIRS})
+ target_link_libraries(moonlight ${EVDEV_LIBRARIES} ${ALSA_LIBRARY} ${OPUS_LIBRARY} ${UDEV_LIBRARIES} ${CMAKE_DL_LIBS})
  
- include(${CMAKE_ROOT}/Modules/GNUInstallDirs.cmake)
- install(TARGETS moonlight DESTINATION ${CMAKE_INSTALL_BINDIR})
+ add_subdirectory(docs)
+Index: moonlight-embedded/libgamestream/CMakeLists.txt
+===================================================================
+--- moonlight-embedded.orig/libgamestream/CMakeLists.txt	2015-08-14 14:05:22.000000000 +0000
++++ moonlight-embedded/libgamestream/CMakeLists.txt	2015-08-14 14:10:39.000000000 +0000
+@@ -14,13 +14,13 @@
+ 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/debian/rules b/debian/rules
index a81f33e..16fe403 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,5 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_CFLAGS_MAINT_APPEND = -std=gnu99
-
 %:
 	dh $@ --with quilt