diff --git a/CMakeLists.txt b/CMakeLists.txt
index c177ac4..de74cc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,18 +48,12 @@ find_package(rtaudio REQUIRED)
 find_package(aasdk REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(GObject)
+find_package(libomx)
 
 if(WIN32)
     set(WINSOCK2_LIBRARIES "ws2_32")
 endif(WIN32)
 
-if(RPI_BUILD AND NOT GST_BUILD)
-    add_definitions(-DUSE_OMX -DOMX_SKIP64BIT)
-    set(BCM_HOST_LIBRARIES "/opt/vc/lib/libbcm_host.so")
-    set(BCM_HOST_INCLUDE_DIRS "/opt/vc/include")
-    set(ILCLIENT_INCLUDE_DIRS "/opt/vc/src/hello_pi/libs/ilclient")
-    set(ILCLIENT_LIBRARIES "/opt/vc/src/hello_pi/libs/ilclient/libilclient.a;/opt/vc/lib/libvcos.so;/opt/vc/lib/libvcilcs.a;/opt/vc/lib/libvchiq_arm.so")
-endif(RPI_BUILD AND NOT GST_BUILD)
 if(GST_BUILD)
     find_package(Qt5GStreamer)
     find_package(PkgConfig REQUIRED)
@@ -89,8 +83,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
                     ${PROTOBUF_INCLUDE_DIR}
                     ${OPENSSL_INCLUDE_DIR}
                     ${RTAUDIO_INCLUDE_DIRS}
-                    ${BCM_HOST_INCLUDE_DIRS}
-                    ${ILCLIENT_INCLUDE_DIRS}
                     ${GST_INCLUDE_DIRS}
                     ${include_directory})
 
@@ -105,6 +97,7 @@ file(GLOB_RECURSE autoapp_source_files ${autoapp_sources_directory}/*.ui ${autoa
 add_executable(autoapp ${autoapp_source_files})
 
 message(STATUS "${GST_LIBRARIES}")
+
 target_link_libraries(autoapp aasdk libusb
                         ${GST_LIBRARIES}
                         ${Boost_LIBRARIES}
@@ -114,8 +107,6 @@ target_link_libraries(autoapp aasdk libusb
                         ${Qt5Bluetooth_LIBRARIES}
                         ${PROTOBUF_LIBRARIES}
                         ${ZLIB_LIBRARIES}
-                        ${BCM_HOST_LIBRARIES}
-                        ${ILCLIENT_LIBRARIES}
                         ${WINSOCK2_LIBRARIES}
                         ${RTAUDIO_LIBRARIES}
                         ${QTGLIB_LIBRARY}
@@ -129,6 +120,10 @@ target_link_libraries(autoapp aasdk libusb
                         ${GOBJECT_LIBRARIES}
 			)
 
+if(libomx_FOUND AND NOT GST_BUILD)
+	target_link_libraries(autoapp omx)
+endif()
+
 set(btservice_sources_directory ${sources_directory}/btservice)
 set(btservice_include_directory ${include_directory}/f1x/openauto/btservice)
 file(GLOB_RECURSE btservice_source_files ${btservice_sources_directory}/*.cpp ${btservice_include_directory}/*.hpp ${common_include_directory}/*.hpp)