diff --git a/packages/audio/asplib/package.mk b/packages/audio/asplib/package.mk
index dcc3665212..e3cc452492 100644
--- a/packages/audio/asplib/package.mk
+++ b/packages/audio/asplib/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="asplib"
-PKG_VERSION="2fac1bf"
+PKG_VERSION="da66f51"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/audio/asplib/patches/asplib-cmake.patch b/packages/audio/asplib/patches/asplib-cmake.patch
index 8782cf72e6..d4f5556b97 100644
--- a/packages/audio/asplib/patches/asplib-cmake.patch
+++ b/packages/audio/asplib/patches/asplib-cmake.patch
@@ -1,20 +1,21 @@
 diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2016-01-12 22:24:43.000000000 +0100
-+++ b/CMakeLists.txt	2016-01-12 22:47:16.624139358 +0100
-@@ -1,64 +1,17 @@
+--- a/CMakeLists.txt	2016-03-09 15:16:52.000000000 -0800
++++ b/CMakeLists.txt	2016-03-30 22:45:01.502582518 -0700
+@@ -1,46 +1,15 @@
  project(asplib)
  
  cmake_minimum_required(VERSION 2.6)
 -enable_language(CXX)
--
+ 
 -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
 -
--include(UseMultiArch.cmake)
+-include(cmake/UseMultiArch.cmake)
+ include(cmake/asplib_helpers.cmake)
  
  set(asplib_NAME asplib)
  set(asplib_DESCRIPTION "asplib (Achim's Signal Processing LIBrary), is a small and lightweight C++ library for digital signal processing.")
--set(asplib_VERSION_MAJOR ${APP_VERSION_MAJOR})
--set(asplib_VERSION_MINOR ${APP_VERSION_MINOR})
+-set(asplib_VERSION_MAJOR 0)
+-set(asplib_VERSION_MINOR 2)
 -set(asplib_VERSION_PATCH 0)
 -
 -if(NOT WIN32)
@@ -27,111 +28,65 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
 -
 -if(CMAKE_SYSTEM_NAME MATCHES "Windows")
 -  set(CMAKE_CXX_FLAGS "-DTARGET_WINDOWS")
+-  # Enable the orginization of projects with folders
+-  set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 -endif()
 -
--#set(asplib_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi")
--#set(asplib_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${TINYXML_LIBRARIES})
--
 -if (NOT WIN32)
 -  add_definitions(-fPIC -g -O2)
 -endif()
 -
--include_directories(${PROJECT_SOURCE_DIR}
--                    ${PROJECT_SOURCE_DIR}/Biquads)
+-set(asplib_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}
+-                        ${PROJECT_SOURCE_DIR}/Biquads
+-                        ${CMAKE_INSTALL_PREFIX}/include/asplib)
+-
+-include_directories(${asplib_INCLUDE_DIRS})
  
--set(SOURCES asplib_utils/computeDeviceInfo/cpuInfo.cpp
--            Biquads/Biquad_Native/asplib_Biquad_Native.cpp
-+set(SOURCES Biquads/Biquad_Native/asplib_Biquad_Native.cpp
+ set(SOURCES Biquads/Biquad_Native/asplib_Biquad_Native.cpp
              Biquads/apslib_BiquadFactory.cpp)
+-          
++
+ set(HEADERS interfaces/asplib_IBaseBiquad.h
+             Biquads/apslib_BiquadFactory.h
+             Biquads/Biquad_Native/asplib_Biquad_Native.h
+@@ -54,35 +23,13 @@
+             asplib_utils/os/linux/linux_definitions.h
+             asplib_utils/os/raspberry_pi/raspberry_pi_definitions.h
+             asplib_utils/os/windows/windows_definitions.h)
+-            
+-asplib_source_group("${SOURCES}")
+-asplib_source_group("${HEADERS}")
  
--set(HEADERS interfaces/asplib_IBaseBiquad.h
--            asplib_utils/constants_typedefs/asplib_constants.h
--            asplib_utils/constants_typedefs/asplib_typedefs.h
--            asplib_utils/os/asplib_base_os.h
--            asplib_utils/os/windows/windows_definitions.h
--            asplib_utils/os/linux/linux_definitions.h
--            asplib_utils/computeDeviceInfo/cpuInfo_types.h
--            asplib_utils/computeDeviceInfo/cpuInfo.h
--            Biquads/apslib_BiquadFactory.h
--            Biquads/Biquad_Native/asplib_Biquad_Native.h)
--
--
--#include_directories(${TINYXML_INCLUDE_DIR} ${KODI_INCLUDE_DIR})
--
--add_library(asplib ${SOURCES} ${PLAT_SOURCES})
+-add_library(asplib ${SOURCES} ${HEADERS})
 -target_link_libraries(asplib ${asplib_LIBRARIES})
--#set_target_properties(asplib PROPERTIES VERSION ${asplib_VERSION_MAJOR}.${asplib_VERSION_MINOR}.${asplib_VERSION_PATCH}
--#                                              SOVERSION ${asplib_VERSION_MAJOR}.0)
-+add_library(asplib STATIC ${SOURCES})
+-set_target_properties(asplib PROPERTIES VERSION ${asplib_VERSION_MAJOR}.${asplib_VERSION_MINOR}.${asplib_VERSION_PATCH}
+-                                                SOVERSION ${asplib_VERSION_MAJOR}.0)
++asplib_install_with_folder("${HEADERS}" ${CMAKE_INSTALL_PREFIX}/include/asplib)
+ 
++add_library(asplib STATIC ${SOURCES} ${HEADERS})
  
 -install(TARGETS asplib DESTINATION ${CMAKE_INSTALL_LIBDIR})
 +include_directories(${PROJECT_SOURCE_DIR}
 +                    ${PROJECT_SOURCE_DIR}/Biquads)
  
- install(DIRECTORY ${PROJECT_SOURCE_DIR}/interfaces/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib/interfaces
-         FILES_MATCHING PATTERN "*.h")
-@@ -66,8 +19,6 @@
-         FILES_MATCHING PATTERN "*.h")
- install(DIRECTORY ${PROJECT_SOURCE_DIR}/asplib_utils/os/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib/asplib_utils/os/
-         FILES_MATCHING PATTERN "*.h")
--install(DIRECTORY ${PROJECT_SOURCE_DIR}/asplib_utils/os/windows/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib/asplib_utils/os/windows/ 
--        FILES_MATCHING PATTERN "*.h")
- install(DIRECTORY ${PROJECT_SOURCE_DIR}/asplib_utils/os/linux/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib/asplib_utils/os/linux/
-         FILES_MATCHING PATTERN "*.h")
- install(DIRECTORY ${PROJECT_SOURCE_DIR}/asplib_utils/computeDeviceInfo/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib/asplib_utils/computeDeviceInfo/
-@@ -77,54 +28,4 @@
- install(DIRECTORY ${PROJECT_SOURCE_DIR}/Biquads/Biquad_Native/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib/Biquads/Biquad_Native/
-         FILES_MATCHING PATTERN "*.h")
- 
--
--# install(FILES interfaces/asplib_IBaseBiquad.h
--              # asplib_utils/constants_typedefs/asplib_constants.h
--              # asplib_utils/constants_typedefs/asplib_typedefs.h
--      
--              # DESTINATION include/asplib/asplib_utils/constants_typedefs/)
--      
--      # asplib_utils/os/asplib_base_os.h
--      # asplib_utils/os/windows/windows_definitions.h
--      # asplib_utils/os/linux/linux_definitions.h
--      # utils/computeDeviceInfo/cpuInfo_types.h
--      # utils/computeDeviceInfo/cpuInfo.h
--      # Biquads/apslib_BiquadFactory.h
--            # Biquads/Biquad_Native/asplib_Biquad_Native.h
--      # )
--
--# install(FILES interfaces/asplib_IBaseBiquad.h
--        # DESTINATION include/asplib/interfaces)
--# install(FILES constants_typedefs/asplib_constants.h
--              # constants_typedefs/asplib_typedefs.h
--        # DESTINATION include/asplib/constants_typedefs)
--# install(FILES utils/computeDeviceInfo/cpuInfo_types.h
--              # utils/computeDeviceInfo/cpuInfo.h
--        # DESTINATION include/asplib/utils)
--# install(FILES Biquads/apslib_BiquadFactory.h
--              # Biquads/Biquad_Native/asplib_Biquad_Native.h
--        # DESTINATION include/asplib/Biquads)
++install(TARGETS asplib DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+ asplib_install_with_folder("${HEADERS}" ${CMAKE_INSTALL_PREFIX}/include/asplib)
 -        
--#install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asplib)
--
--#IF(NOT WIN32)
+-IF(NOT WIN32)
 -  # Pkgconfig
--  #include(PkgConfigHandler.cmake)
--  #configure_pc_file(kodiutilities kodiutilities.pc.in
--  #                              kodiutilities.pc
--  #                               ${CMAKE_INSTALL_PREFIX}
--  #                               ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
--  #                               ${CMAKE_INSTALL_PREFIX}/include)
+-  include(cmake/PkgConfigHandler.cmake)
+-  configure_pc_file(asplib asplib.pc.in
+-                           asplib.pc
+-                           ${CMAKE_INSTALL_PREFIX}
+-                           ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
+-                           ${CMAKE_INSTALL_PREFIX}/include)
 -
--#  install(FILES ${CMAKE_BINARY_DIR}/kodiutilities.pc
--#          DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/pkgconfig)
--#ENDIF(NOT WIN32)
+-  install(FILES ${CMAKE_BINARY_DIR}/asplib.pc
+-          DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/pkgconfig)
+-ENDIF(NOT WIN32)
 -
 -# config mode
--#configure_file (kodiutilities-config.cmake.in
--#                kodiutilities-config.cmake @ONLY)
--#install(FILES ${CMAKE_BINARY_DIR}/kodiutilities-config.cmake
--#       DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/kodiutilities)
--
--# Quell warnings with in-tree builds
--#set(KODI_BUILD_DIR ${KODI_BUILD_DIR})
-+install(TARGETS asplib DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+-configure_file(asplib-config.cmake.in
+-               asplib-config.cmake @ONLY)
+-install(FILES ${CMAKE_BINARY_DIR}/asplib-config.cmake
+-        DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/asplib)