diff --git a/packages/3rdparty/lib/cxxtools/package.mk b/packages/3rdparty/lib/cxxtools/package.mk
index 1c7919a281..c82725fa3c 100644
--- a/packages/3rdparty/lib/cxxtools/package.mk
+++ b/packages/3rdparty/lib/cxxtools/package.mk
@@ -48,6 +48,7 @@ post_makeinstall_host() {
 }
 
 post_makeinstall_target() {
-  rm -rf $SYSROOT_PREFIX/usr/bin/cxxtools-config
+  $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/cxxtools-config
+
   rm -rf $INSTALL/usr/bin
 }
diff --git a/packages/3rdparty/web/tntnet/package.mk b/packages/3rdparty/web/tntnet/package.mk
index 29688f208e..1bae7bcbac 100644
--- a/packages/3rdparty/web/tntnet/package.mk
+++ b/packages/3rdparty/web/tntnet/package.mk
@@ -51,6 +51,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \
                            --with-stressjob=no"
 
 post_makeinstall_target() {
+  $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/tntnet-config
+
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/share
 }
diff --git a/packages/3rdparty/web/tntnet/patches/tntnet-pkgconfig-support.patch b/packages/3rdparty/web/tntnet/patches/tntnet-pkgconfig-support.patch
new file mode 100644
index 0000000000..8a6b3963c3
--- /dev/null
+++ b/packages/3rdparty/web/tntnet/patches/tntnet-pkgconfig-support.patch
@@ -0,0 +1,517 @@
+diff -Naur tntnet-2.2.1/configure tntnet-2.2.1.patch/configure
+--- tntnet-2.2.1/configure	2014-01-17 20:11:49.000000000 +0100
++++ tntnet-2.2.1.patch/configure	2016-01-07 06:34:42.002634975 +0100
+@@ -16495,7 +16546,7 @@
+ ac_config_files="$ac_config_files tntnet-config"
+ 
+ 
+-ac_config_files="$ac_config_files Makefile framework/common/Makefile framework/runtime/Makefile framework/defcomp/Makefile sdk/tools/common/Makefile sdk/tools/ecppc/Makefile sdk/tools/ecppl/Makefile sdk/tools/ecppll/Makefile sdk/demos/Makefile sdk/demos/backgroundjob/Makefile sdk/demos/calc/Makefile sdk/demos/calcajax/Makefile sdk/demos/calcapp/Makefile sdk/demos/calcmvc/Makefile sdk/demos/calci18n/Makefile sdk/demos/chat/Makefile sdk/demos/comp/Makefile sdk/demos/config/Makefile sdk/demos/controls/Makefile sdk/demos/cookie/Makefile sdk/demos/hello/Makefile sdk/demos/savepoint/Makefile sdk/demos/session/Makefile sdk/demos/sprintf/Makefile sdk/demos/strings/Makefile sdk/demos/rajax-jquery/Makefile sdk/demos/upload/Makefile utest/Makefile doc/man/Makefile etc/Makefile"
++ac_config_files="$ac_config_files Makefile framework/common/Makefile framework/runtime/Makefile framework/defcomp/Makefile pkgconfig/tntnet.pc pkgconfig/tntnet_sdk.pc sdk/tools/common/Makefile sdk/tools/ecppc/Makefile sdk/tools/ecppl/Makefile sdk/tools/ecppll/Makefile sdk/demos/Makefile sdk/demos/backgroundjob/Makefile sdk/demos/calc/Makefile sdk/demos/calcajax/Makefile sdk/demos/calcapp/Makefile sdk/demos/calcmvc/Makefile sdk/demos/calci18n/Makefile sdk/demos/chat/Makefile sdk/demos/comp/Makefile sdk/demos/config/Makefile sdk/demos/controls/Makefile sdk/demos/cookie/Makefile sdk/demos/hello/Makefile sdk/demos/savepoint/Makefile sdk/demos/session/Makefile sdk/demos/sprintf/Makefile sdk/demos/strings/Makefile sdk/demos/rajax-jquery/Makefile sdk/demos/upload/Makefile utest/Makefile doc/man/Makefile etc/Makefile"
+ 
+ 
+ cat >confcache <<\_ACEOF
+@@ -17642,6 +17693,8 @@
+     "framework/common/Makefile") CONFIG_FILES="$CONFIG_FILES framework/common/Makefile" ;;
+     "framework/runtime/Makefile") CONFIG_FILES="$CONFIG_FILES framework/runtime/Makefile" ;;
+     "framework/defcomp/Makefile") CONFIG_FILES="$CONFIG_FILES framework/defcomp/Makefile" ;;
++    "pkgconfig/tntnet.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/tntnet.pc" ;;
++    "pkgconfig/tntnet_sdk.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/tntnet_sdk.pc" ;;
+     "sdk/tools/common/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/common/Makefile" ;;
+     "sdk/tools/ecppc/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/ecppc/Makefile" ;;
+     "sdk/tools/ecppl/Makefile") CONFIG_FILES="$CONFIG_FILES sdk/tools/ecppl/Makefile" ;;
+diff -Naur tntnet-2.2.1/configure.in tntnet-2.2.1.patch/configure.in
+--- tntnet-2.2.1/configure.in	2014-01-17 20:11:40.000000000 +0100
++++ tntnet-2.2.1.patch/configure.in	2016-01-07 06:08:14.679087771 +0100
+@@ -218,6 +218,8 @@
+     framework/common/Makefile
+     framework/runtime/Makefile
+     framework/defcomp/Makefile
++    pkgconfig/tntnet.pc
++    pkgconfig/tntnet_sdk.pc
+     sdk/tools/common/Makefile
+     sdk/tools/ecppc/Makefile
+     sdk/tools/ecppl/Makefile
+diff -Naur tntnet-2.2.1/Makefile.am tntnet-2.2.1.patch/Makefile.am
+--- tntnet-2.2.1/Makefile.am	2014-01-17 20:12:20.000000000 +0100
++++ tntnet-2.2.1.patch/Makefile.am	2016-01-07 06:07:03.793973412 +0100
+@@ -80,3 +80,9 @@
+     Releasenotes-2.2.markdown \
+     Releasenotes-2.2.1.markdown \
+     $(pkgdata_SCRIPTS)
++
++pkgconfigdir = $(libdir)/pkgconfig/
++
++pkgconfig_DATA = \
++    pkgconfig/tntnet.pc \
++    pkgconfig/tntnet_sdk.pc
+diff -Naur tntnet-2.2.1/Makefile.in tntnet-2.2.1.patch/Makefile.in
+--- tntnet-2.2.1/Makefile.in	2014-01-17 20:12:26.000000000 +0100
++++ tntnet-2.2.1.patch/Makefile.in	2016-01-07 06:33:05.045478363 +0100
+@@ -1,7 +1,7 @@
+-# Makefile.in generated by automake 1.12.2 from Makefile.am.
++# Makefile.in generated by automake 1.13.4 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
++# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+ 
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -14,24 +14,53 @@
+ 
+ @SET_MAKE@
+ 
++
+ VPATH = @srcdir@
+-am__make_dryrun = \
+-  { \
+-    am__dry=no; \
++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++am__make_running_with_option = \
++  case $${target_option-} in \
++      ?) ;; \
++      *) echo "am__make_running_with_option: internal error: invalid" \
++              "target option '$${target_option-}' specified" >&2; \
++         exit 1;; \
++  esac; \
++  has_opt=no; \
++  sane_makeflags=$$MAKEFLAGS; \
++  if $(am__is_gnu_make); then \
++    sane_makeflags=$$MFLAGS; \
++  else \
+     case $$MAKEFLAGS in \
+       *\\[\ \	]*) \
+-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+-      *) \
+-        for am__flg in $$MAKEFLAGS; do \
+-          case $$am__flg in \
+-            *=*|--*) ;; \
+-            *n*) am__dry=yes; break;; \
+-          esac; \
+-        done;; \
++        bs=\\; \
++        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
++          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+     esac; \
+-    test $$am__dry = yes; \
+-  }
++  fi; \
++  skip_next=no; \
++  strip_trailopt () \
++  { \
++    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
++  }; \
++  for flg in $$sane_makeflags; do \
++    test $$skip_next = yes && { skip_next=no; continue; }; \
++    case $$flg in \
++      *=*|--*) continue;; \
++        -*I) strip_trailopt 'I'; skip_next=yes;; \
++      -*I?*) strip_trailopt 'I';; \
++        -*O) strip_trailopt 'O'; skip_next=yes;; \
++      -*O?*) strip_trailopt 'O';; \
++        -*l) strip_trailopt 'l'; skip_next=yes;; \
++      -*l?*) strip_trailopt 'l';; \
++      -[dEDm]) skip_next=yes;; \
++      -[JT]) skip_next=yes;; \
++    esac; \
++    case $$flg in \
++      *$$target_option*) has_opt=yes; break;; \
++    esac; \
++  done; \
++  test $$has_opt = yes
++am__make_dryrun = (target_option=n; $(am__make_running_with_option))
++am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -52,11 +81,13 @@
+ host_triplet = @host@
+ target_triplet = @target@
+ subdir = .
+-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(srcdir)/tntnet-config.in \
+-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+-	TODO config.guess config.sub depcomp install-sh ltmain.sh \
+-	missing
++DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
++	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
++	$(top_srcdir)/configure $(am__configure_deps) \
++	$(srcdir)/tntnet-config.in \
++	$(top_srcdir)/pkgconfig/tntnet.pc.in \
++	$(top_srcdir)/pkgconfig/tntnet_sdk.pc.in COPYING TODO \
++	config.guess config.sub depcomp install-sh missing ltmain.sh
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+ 	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+@@ -71,7 +102,8 @@
+  configure.lineno config.status.lineno
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/framework/common/config.h
+-CONFIG_CLEAN_FILES = tntnet-config
++CONFIG_CLEAN_FILES = tntnet-config pkgconfig/tntnet.pc \
++	pkgconfig/tntnet_sdk.pc
+ CONFIG_CLEAN_VPATH_FILES =
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+@@ -100,27 +132,62 @@
+     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" \
++	"$(DESTDIR)$(pkgconfigdir)"
+ SCRIPTS = $(bin_SCRIPTS) $(pkgdata_SCRIPTS)
++AM_V_P = $(am__v_P_@AM_V@)
++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
++am__v_P_0 = false
++am__v_P_1 = :
++AM_V_GEN = $(am__v_GEN_@AM_V@)
++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
++am__v_GEN_0 = @echo "  GEN     " $@;
++am__v_GEN_1 = 
++AM_V_at = $(am__v_at_@AM_V@)
++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
++am__v_at_0 = @
++am__v_at_1 = 
+ SOURCES =
+ DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-	html-recursive info-recursive install-data-recursive \
+-	install-dvi-recursive install-exec-recursive \
+-	install-html-recursive install-info-recursive \
+-	install-pdf-recursive install-ps-recursive install-recursive \
+-	installcheck-recursive installdirs-recursive pdf-recursive \
+-	ps-recursive uninstall-recursive
++RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
++	ctags-recursive dvi-recursive html-recursive info-recursive \
++	install-data-recursive install-dvi-recursive \
++	install-exec-recursive install-html-recursive \
++	install-info-recursive install-pdf-recursive \
++	install-ps-recursive install-recursive installcheck-recursive \
++	installdirs-recursive pdf-recursive ps-recursive \
++	tags-recursive uninstall-recursive
+ am__can_run_installinfo = \
+   case $$AM_UPDATE_INFO_DIR in \
+     n|no|NO) false;; \
+     *) (install-info --version) >/dev/null 2>&1;; \
+   esac
++DATA = $(pkgconfig_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
++am__recursive_targets = \
++  $(RECURSIVE_TARGETS) \
++  $(RECURSIVE_CLEAN_TARGETS) \
++  $(am__extra_recursive_targets)
++AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ 	cscope distdir dist dist-all distcheck
++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
++# Read a list of newline-separated strings from the standard input,
++# and print each of them once, without duplicates.  Input order is
++# *not* preserved.
++am__uniquify_input = $(AWK) '\
++  BEGIN { nonempty = 0; } \
++  { items[$$0] = 1; nonempty = 1; } \
++  END { if (nonempty) { for (i in items) print i; }; } \
++'
++# Make sure the list of sources is unique.  This is necessary because,
++# e.g., the same source file might be shared among _SOURCES variables
++# for different programs/libraries.
++am__define_uniq_tagged_files = \
++  list='$(am__tagged_files)'; \
++  unique=`for i in $$list; do \
++    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++  done | $(am__uniquify_input)`
+ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+@@ -179,6 +246,7 @@
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+ AM_CFLAGS = @AM_CFLAGS@
++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+@@ -382,6 +450,11 @@
+     Releasenotes-2.2.1.markdown \
+     $(pkgdata_SCRIPTS)
+ 
++pkgconfigdir = $(libdir)/pkgconfig/
++pkgconfig_DATA = \
++    pkgconfig/tntnet.pc \
++    pkgconfig/tntnet_sdk.pc
++
+ all: all-recursive
+ 
+ .SUFFIXES:
+@@ -421,6 +494,10 @@
+ $(am__aclocal_m4_deps):
+ tntnet-config: $(top_builddir)/config.status $(srcdir)/tntnet-config.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
++pkgconfig/tntnet.pc: $(top_builddir)/config.status $(top_srcdir)/pkgconfig/tntnet.pc.in
++	cd $(top_builddir) && $(SHELL) ./config.status $@
++pkgconfig/tntnet_sdk.pc: $(top_builddir)/config.status $(top_srcdir)/pkgconfig/tntnet_sdk.pc.in
++	cd $(top_builddir) && $(SHELL) ./config.status $@
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+ 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+@@ -500,6 +577,27 @@
+ 
+ distclean-libtool:
+ 	-rm -f libtool config.lt
++install-pkgconfigDATA: $(pkgconfig_DATA)
++	@$(NORMAL_INSTALL)
++	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
++	if test -n "$$list"; then \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
++	fi; \
++	for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  echo "$$d$$p"; \
++	done | $(am__base_list) | \
++	while read files; do \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
++	done
++
++uninstall-pkgconfigDATA:
++	@$(NORMAL_UNINSTALL)
++	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
++	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run 'make' without going through this Makefile.
+@@ -507,14 +605,13 @@
+ # (1) if the variable is set in 'config.status', edit 'config.status'
+ #     (which will cause the Makefiles to be regenerated when you run 'make');
+ # (2) otherwise, pass the desired values on the 'make' command line.
+-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
+-	@fail= failcom='exit 1'; \
+-	for f in x $$MAKEFLAGS; do \
+-	  case $$f in \
+-	    *=* | --[!k]*);; \
+-	    *k*) failcom='fail=yes';; \
+-	  esac; \
+-	done; \
++$(am__recursive_targets):
++	@fail=; \
++	if $(am__make_keepgoing); then \
++	  failcom='fail=yes'; \
++	else \
++	  failcom='exit 1'; \
++	fi; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	case "$@" in \
+@@ -535,31 +632,13 @@
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ 	fi; test -z "$$fail"
+-tags-recursive:
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+-	done
+-ctags-recursive:
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+-	done
+-cscopelist-recursive:
+-	list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+-	done
+ 
+-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+-	mkid -fID $$unique
+-tags: TAGS
++ID: $(am__tagged_files)
++	$(am__define_uniq_tagged_files); mkid -fID $$unique
++tags: tags-recursive
++TAGS: tags
+ 
+-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+-		$(TAGS_FILES) $(LISP)
++tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ 	set x; \
+ 	here=`pwd`; \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+@@ -575,12 +654,7 @@
+ 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
++	$(am__define_uniq_tagged_files); \
+ 	shift; \
+ 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+@@ -592,15 +666,11 @@
+ 	      $$unique; \
+ 	  fi; \
+ 	fi
+-ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+-		$(TAGS_FILES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+-	unique=`for i in $$list; do \
+-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+-	  done | \
+-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
++ctags: ctags-recursive
++
++CTAGS: ctags
++ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
++	$(am__define_uniq_tagged_files); \
+ 	test -z "$(CTAGS_ARGS)$$unique" \
+ 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ 	     $$unique
+@@ -609,18 +679,16 @@
+ 	here=`$(am__cd) $(top_builddir) && pwd` \
+ 	  && $(am__cd) $(top_srcdir) \
+ 	  && gtags -i $(GTAGS_ARGS) "$$here"
+-
+ cscope: cscope.files
+ 	test ! -s cscope.files \
+ 	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+-
+ clean-cscope:
+ 	-rm -f cscope.files
++cscope.files: clean-cscope cscopelist
++cscopelist: cscopelist-recursive
+ 
+-cscope.files: clean-cscope cscopelist-recursive cscopelist
+-
+-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
++cscopelist-am: $(am__tagged_files)
++	list='$(am__tagged_files)'; \
+ 	case "$(srcdir)" in \
+ 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ 	  *) sdir=$(subdir)/$(srcdir) ;; \
+@@ -754,9 +822,9 @@
+ 	*.zip*) \
+ 	  unzip $(distdir).zip ;;\
+ 	esac
+-	chmod -R a-w $(distdir); chmod u+w $(distdir)
+-	mkdir $(distdir)/_build
+-	mkdir $(distdir)/_inst
++	chmod -R a-w $(distdir)
++	chmod u+w $(distdir)
++	mkdir $(distdir)/_build $(distdir)/_inst
+ 	chmod a-w $(distdir)
+ 	test -d $(distdir)/_build || exit 0; \
+ 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+@@ -820,10 +888,10 @@
+ 	       exit 1; } >&2
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(SCRIPTS)
++all-am: Makefile $(SCRIPTS) $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \
++	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgconfigdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+@@ -878,7 +946,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-pkgdataSCRIPTS
++install-data-am: install-pkgconfigDATA install-pkgdataSCRIPTS
+ 
+ install-dvi: install-dvi-recursive
+ 
+@@ -924,30 +992,29 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataSCRIPTS
++uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA \
++	uninstall-pkgdataSCRIPTS
++
++.MAKE: $(am__recursive_targets) install-am install-strip
+ 
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
+-	cscopelist-recursive ctags-recursive install-am install-strip \
+-	tags-recursive
+-
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+-	all all-am am--refresh check check-am clean clean-cscope \
+-	clean-generic clean-libtool cscope cscopelist \
+-	cscopelist-recursive ctags ctags-recursive dist dist-all \
+-	dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
+-	dist-zip distcheck distclean distclean-generic \
++.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
++	am--refresh check check-am clean clean-cscope clean-generic \
++	clean-libtool cscope cscopelist-am ctags ctags-am dist \
++	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
++	dist-xz dist-zip distcheck distclean distclean-generic \
+ 	distclean-libtool distclean-tags distcleancheck distdir \
+ 	distuninstallcheck dvi dvi-am html html-am info info-am \
+ 	install install-am install-binSCRIPTS install-data \
+ 	install-data-am install-dvi install-dvi-am install-exec \
+ 	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-man install-pdf install-pdf-am \
+-	install-pkgdataSCRIPTS install-ps install-ps-am install-strip \
+-	installcheck installcheck-am installdirs installdirs-am \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am \
+-	uninstall-binSCRIPTS uninstall-pkgdataSCRIPTS
++	install-pkgconfigDATA install-pkgdataSCRIPTS install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
++	installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
++	uninstall-am uninstall-binSCRIPTS uninstall-pkgconfigDATA \
++	uninstall-pkgdataSCRIPTS
+ 
+ 
+ tntnet-config: tntnet-config.in
+diff -Naur tntnet-2.2.1/pkgconfig/tntnet.pc.in tntnet-2.2.1.patch/pkgconfig/tntnet.pc.in
+--- tntnet-2.2.1/pkgconfig/tntnet.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ tntnet-2.2.1.patch/pkgconfig/tntnet.pc.in	2016-01-07 06:07:03.794973414 +0100
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: tntnet
++Description: Modular, multithreaded web application library for C++
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -ltntnet
++Cflags: -I${includedir}
++Requires.private: cxxtools
+diff -Naur tntnet-2.2.1/pkgconfig/tntnet_sdk.pc.in tntnet-2.2.1.patch/pkgconfig/tntnet_sdk.pc.in
+--- tntnet-2.2.1/pkgconfig/tntnet_sdk.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ tntnet-2.2.1.patch/pkgconfig/tntnet_sdk.pc.in	2016-01-07 06:07:03.795973416 +0100
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: tntnet_sdk
++Description: Helper library for ecpp-parsing programs
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -ltntnet_sdk
++Cflags: -I${includedir}
++Requires.private: cxxtools
diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk
index b73a0eaf47..65ec4ad888 100644
--- a/packages/databases/sqlite/package.mk
+++ b/packages/databases/sqlite/package.mk
@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3090200"
+PKG_VERSION="autoconf-3100000"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"
 PKG_SITE="https://www.sqlite.org/"
-PKG_URL="https://www.sqlite.org/2015/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://www.sqlite.org/2016/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="database"
diff --git a/packages/devel/fribidi/package.mk b/packages/devel/fribidi/package.mk
index d43af12d6a..ca58b35209 100644
--- a/packages/devel/fribidi/package.mk
+++ b/packages/devel/fribidi/package.mk
@@ -48,9 +48,9 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp -f $PKG_DIR/scripts/fribidi-config $ROOT/$TOOLCHAIN/bin
-    chmod +x $ROOT/$TOOLCHAIN/bin/fribidi-config
+  mkdir -p $SYSROOT_PREFIX/usr/bin
+    cp -f $PKG_DIR/scripts/fribidi-config $SYSROOT_PREFIX/usr/bin
+    chmod +x $SYSROOT_PREFIX/usr/bin/fribidi-config
 
   rm -rf $INSTALL/usr/bin
 }
diff --git a/packages/devel/pcre/package.mk b/packages/devel/pcre/package.mk
index 25322acb12..15e28fac02 100644
--- a/packages/devel/pcre/package.mk
+++ b/packages/devel/pcre/package.mk
@@ -52,4 +52,5 @@ pre_configure_target() {
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
+  sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/$PKG_NAME-config
 }
diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk
index 41b2ca54f6..cc37949bdf 100644
--- a/packages/graphics/libdrm/package.mk
+++ b/packages/graphics/libdrm/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libdrm"
-PKG_VERSION="2.4.65"
+PKG_VERSION="2.4.66"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/graphics/libpng/package.mk b/packages/graphics/libpng/package.mk
index 3ab3da0eee..69fc3e8412 100644
--- a/packages/graphics/libpng/package.mk
+++ b/packages/graphics/libpng/package.mk
@@ -51,10 +51,8 @@ pre_configure_target() {
 
 post_makeinstall_target() {
   sed -e "s:\([\"'= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \
-      -e "s:libs=\"-lpng15\":libs=\"-lpng15 -lz\":g" \
+      -e "s:libs=\"-lpng16\":libs=\"-lpng16 -lz\":g" \
       -i $SYSROOT_PREFIX/usr/bin/libpng*-config
 
-  cp -P $SYSROOT_PREFIX/usr/bin/libpng*-config $ROOT/$TOOLCHAIN/bin
-
   rm -rf $INSTALL/usr/bin
 }
diff --git a/packages/multimedia/SDL2/package.mk b/packages/multimedia/SDL2/package.mk
index 17759d6da8..4c904fa5d6 100644
--- a/packages/multimedia/SDL2/package.mk
+++ b/packages/multimedia/SDL2/package.mk
@@ -116,9 +116,7 @@ pre_make_target() {
 }
 
 post_makeinstall_target() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp $SYSROOT_PREFIX/usr/bin/sdl2-config $ROOT/$TOOLCHAIN/bin
-    $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/sdl2-config
+  $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/sdl2-config
 
   rm -rf $INSTALL/usr/bin
 }
diff --git a/packages/multimedia/libaacs/package.mk b/packages/multimedia/libaacs/package.mk
index d11f64f6ef..5942707d7a 100644
--- a/packages/multimedia/libaacs/package.mk
+++ b/packages/multimedia/libaacs/package.mk
@@ -35,6 +35,8 @@ PKG_AUTORECONF="yes"
 PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
                            --disable-extra-warnings \
                            --disable-optimizations \
+                           --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr \
+                           --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr \
                            --with-gnu-ld"
 
 post_makeinstall_target() {
diff --git a/packages/multimedia/libbdplus/package.mk b/packages/multimedia/libbdplus/package.mk
index 4cbd80c633..e46cb6be64 100644
--- a/packages/multimedia/libbdplus/package.mk
+++ b/packages/multimedia/libbdplus/package.mk
@@ -35,6 +35,8 @@ PKG_AUTORECONF="yes"
 PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
                            --disable-extra-warnings \
                            --disable-optimizations \
+                           --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr \
+                           --with-gpg-error-prefix=$SYSROOT_PREFIX/usr \
                            --with-gnu-ld"
 
 if [ "$BLURAY_AACS_SUPPORT" = "yes" ]; then
diff --git a/packages/multimedia/libbluray/package.mk b/packages/multimedia/libbluray/package.mk
index de60ee64ab..457c4c6263 100644
--- a/packages/multimedia/libbluray/package.mk
+++ b/packages/multimedia/libbluray/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libbluray"
-PKG_VERSION="0.9.1"
+PKG_VERSION="0.9.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/multimedia/vdr-dummydevice/package.mk b/packages/multimedia/vdr-dummydevice/package.mk
index 5611019608..1c69fe323a 100644
--- a/packages/multimedia/vdr-dummydevice/package.mk
+++ b/packages/multimedia/vdr-dummydevice/package.mk
@@ -47,8 +47,9 @@ make_target() {
 post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+  LIB_NAME=lib${PKG_NAME}
 
-  cp --remove-destination libvdr*.so libvdr.so.${VDR_APIVERSION}
+  cp --remove-destination ${LIB_NAME}.so ${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 
diff --git a/packages/multimedia/vdr-epgsearch/patches/vdr-epgsearch-pkgconfig.patch b/packages/multimedia/vdr-epgsearch/patches/vdr-epgsearch-pkgconfig.patch
new file mode 100644
index 0000000000..4da0f3bcde
--- /dev/null
+++ b/packages/multimedia/vdr-epgsearch/patches/vdr-epgsearch-pkgconfig.patch
@@ -0,0 +1,15 @@
+diff -Naur vdr-epgsearch-29c174a/Makefile vdr-epgsearch-29c174a.patch/Makefile
+--- vdr-epgsearch-29c174a/Makefile	2014-01-18 16:53:11.000000000 +0100
++++ vdr-epgsearch-29c174a.patch/Makefile	2016-01-07 04:47:33.004326981 +0100
+@@ -130,9 +130,8 @@
+ OBJS = afuzzy.o blacklist.o changrp.o confdloader.o conflictcheck.o conflictcheck_thread.o distance.o $(PLUGIN).o epgsearchcats.o epgsearchcfg.o epgsearchext.o epgsearchsetup.o  epgsearchsvdrp.o epgsearchtools.o mail.o md5.o menu_announcelist.o menu_blacklistedit.o menu_blacklists.o menu_commands.o menu_conflictcheck.o menu_deftimercheckmethod.o menu_dirselect.o menu_event.o menu_favorites.o menu_main.o menu_myedittimer.o menu_quicksearch.o menu_recsdone.o menu_search.o menu_searchactions.o menu_searchedit.o menu_searchresults.o menu_searchtemplate.o menu_switchtimers.o menu_templateedit.o menu_timersdone.o menu_whatson.o noannounce.o pending_notifications.o rcfile.o  recdone.o recstatus.o searchtimer_thread.o services.o switchtimer.o switchtimer_thread.o templatefile.o timer_thread.o timerdone.o timerstatus.o uservars.o varparser.o
+ 
+ ifeq ($(REGEXLIB), pcre)
+-LIBS += $(shell pcre-config --libs-posix)
+-#LIBS += -L/usr/lib -lpcreposix -lpcre
+-INCLUDE += $(shell pcre-config --cflags)
++LIBS += $(shell pkg-config --libs libpcreposix libpcre)
++INCLUDES += $(shell pkg-config --cflags libpcre)
+ DEFINES += -DHAVE_PCREPOSIX
+ else ifeq ($(REGEXLIB), tre)
+ LIBS += -L$(shell pkg-config --variable=libdir tre) $(shell pkg-config --libs tre)
diff --git a/packages/multimedia/vdr-iptv/patches/vdr-iptv-pkgconfig.patch b/packages/multimedia/vdr-iptv/patches/vdr-iptv-pkgconfig.patch
new file mode 100644
index 0000000000..3ea17f922e
--- /dev/null
+++ b/packages/multimedia/vdr-iptv/patches/vdr-iptv-pkgconfig.patch
@@ -0,0 +1,12 @@
+diff -Naur iptv-2.2.1/Makefile iptv-2.2.1.patch/Makefile
+--- iptv-2.2.1/Makefile	2015-04-04 03:20:00.000000000 +0200
++++ iptv-2.2.1.patch/Makefile	2016-01-07 07:37:31.037078104 +0100
+@@ -54,7 +54,7 @@
+ 
+ ### Libraries
+ 
+-LIBS = $(shell curl-config --libs)
++LIBS = $(shell pkg-config --libs libcurl)
+ 
+ ### Includes and Defines (add further entries here):
+ 
diff --git a/packages/multimedia/vdr-live/package.mk b/packages/multimedia/vdr-live/package.mk
index 52e936529f..3b46e2598e 100644
--- a/packages/multimedia/vdr-live/package.mk
+++ b/packages/multimedia/vdr-live/package.mk
@@ -34,9 +34,9 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
-  export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
-  export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
 }
 
 pre_make_target() {
diff --git a/packages/multimedia/vdr-live/patches/vdr-live-pkgconfig.patch b/packages/multimedia/vdr-live/patches/vdr-live-pkgconfig.patch
new file mode 100644
index 0000000000..8f159d514a
--- /dev/null
+++ b/packages/multimedia/vdr-live/patches/vdr-live-pkgconfig.patch
@@ -0,0 +1,86 @@
+diff -Naur live-0.3.0/css/Makefile live-0.3.0.patch/css/Makefile
+--- live-0.3.0/css/Makefile	2013-04-04 22:16:40.000000000 +0200
++++ live-0.3.0.patch/css/Makefile	2016-01-07 06:49:35.954078949 +0100
+@@ -4,7 +4,7 @@
+ 
+ ### Additional options to silence TNTNET warnings
+ TNTFLAGS   ?= -Wno-overloaded-virtual -Wno-unused-function
+-TNTVERSION ?= $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
++TNTVERSION ?= $(shell pkg-config --modversion tntnet | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
+ 
+ ### The C++ compiler and options:
+ 
+diff -Naur live-0.3.0/httpd/Makefile live-0.3.0.patch/httpd/Makefile
+--- live-0.3.0/httpd/Makefile	2013-04-04 22:16:40.000000000 +0200
++++ live-0.3.0.patch/httpd/Makefile	2016-01-07 06:51:05.349223371 +0100
+@@ -3,7 +3,7 @@
+ 
+ CXXFLAGS ?= -O2 -Woverloaded-virtual -Wall -fPIC
+ 
+-CXXFLAGS += `tntnet-config --cxxflags`
++CXXFLAGS += `pkg-config --cflags tntnet`
+ 
+ ### Includes and Defines (add further entries here):
+ 
+diff -Naur live-0.3.0/javascript/Makefile live-0.3.0.patch/javascript/Makefile
+--- live-0.3.0/javascript/Makefile	2013-04-04 22:16:40.000000000 +0200
++++ live-0.3.0.patch/javascript/Makefile	2016-01-07 06:49:51.561104158 +0100
+@@ -4,7 +4,7 @@
+ 
+ ### Additional options to silence TNTNET warnings
+ TNTFLAGS   ?= -Wno-overloaded-virtual -Wno-unused-function
+-TNTVERSION ?= $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
++TNTVERSION ?= $(shell pkg-config --modversion tntnet | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
+ 
+ ### The C++ compiler and options:
+ 
+diff -Naur live-0.3.0/Makefile live-0.3.0.patch/Makefile
+--- live-0.3.0/Makefile	2013-04-04 22:16:40.000000000 +0200
++++ live-0.3.0.patch/Makefile	2016-01-07 06:48:29.683971910 +0100
+@@ -26,7 +26,7 @@
+ LDFLAGS	 ?= -fPIC -g
+ 
+ ### Check for libpcre c++ wrapper
+-HAVE_LIBPCRECPP = $(shell pcre-config --libs-cpp)
++HAVE_LIBPCRECPP = $(shell pkg-config --libs libpcrecpp libpcre)
+ 
+ ### The directory environment:
+ 
+@@ -46,18 +46,18 @@
+ 
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ I18NTARG   = $(shell if [ `echo $(APIVERSION) | tr [.] [0]` -ge "10507" ]; then echo "i18n"; fi)
+-TNTVERSION = $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
+-CXXTOOLVER = $(shell cxxtools-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
++TNTVERSION = $(shell pkg-config --modversion tntnet | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
++CXXTOOLVER = $(shell pkg-config --modversion cxxtools | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
+ TNTVERS7   = $(shell ver=$(TNTVERSION); if [ $$ver -ge "1606" ]; then echo "yes"; fi)
+ 
+-CXXFLAGS  += $(shell tntnet-config --cxxflags)
+-LIBS      += $(shell tntnet-config --libs)
++CXXFLAGS  += $(shell pkg-config --cflags tntnet)
++LIBS      += $(shell pkg-config --libs tntnet)
+ 
+ ### Optional configuration features
+ PLUGINFEATURES =
+ ifneq ($(HAVE_LIBPCRECPP),)
+ 	PLUGINFEATURES += -DHAVE_LIBPCRECPP
+-	CXXFLAGS       += $(shell pcre-config --cflags)
++	CXXFLAGS       += $(shell pkg-config --cflags libpcreposix libpcre)
+ 	LIBS           += $(HAVE_LIBPCRECPP)
+ endif
+ 
+diff -Naur live-0.3.0/pages/Makefile live-0.3.0.patch/pages/Makefile
+--- live-0.3.0/pages/Makefile	2013-04-04 22:16:40.000000000 +0200
++++ live-0.3.0.patch/pages/Makefile	2016-01-07 06:50:04.234124627 +0100
+@@ -4,8 +4,8 @@
+ 
+ ### Additional options to silence TNTNET warnings
+ TNTFLAGS   ?= -Wno-overloaded-virtual -Wno-unused-variable
+-TNTVERSION ?= $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
+-CXXTOOLVER ?= $(shell cxxtools-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
++TNTVERSION ?= $(shell pkg-config --modversion tntnet | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
++CXXTOOLVER ?= $(shell pkg-config --modversion cxxtools | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
+ 
+ ### The C++ compiler and options:
+ 
diff --git a/packages/multimedia/vdr-plugin-epgfixer/patches/vdr-plugin-epgfixer-pkgconfig.patch b/packages/multimedia/vdr-plugin-epgfixer/patches/vdr-plugin-epgfixer-pkgconfig.patch
new file mode 100644
index 0000000000..9ba62a07eb
--- /dev/null
+++ b/packages/multimedia/vdr-plugin-epgfixer/patches/vdr-plugin-epgfixer-pkgconfig.patch
@@ -0,0 +1,14 @@
+diff -Naur vdr-plugin-epgfixer-1ad4aaf/Makefile vdr-plugin-epgfixer-1ad4aaf.patch/Makefile
+--- vdr-plugin-epgfixer-1ad4aaf/Makefile	2015-01-01 11:15:50.000000000 +0100
++++ vdr-plugin-epgfixer-1ad4aaf.patch/Makefile	2016-01-07 04:40:37.742655989 +0100
+@@ -70,8 +70,8 @@
+ OBJS = $(PLUGIN).o blacklist.o charset.o config.o epgclone.o epghandler.o regexp.o setup_menu.o tools.o
+ 
+ ifeq ($(REGEXLIB), pcre)
+-LIBS += $(shell pcre-config --libs-posix)
+-INCLUDES += $(shell pcre-config --cflags)
++LIBS += $(shell pkg-config --libs libpcreposix libpcre)
++INCLUDES += $(shell pkg-config --cflags libpcre)
+ DEFINES += -DHAVE_PCREPOSIX
+ endif
+ 
diff --git a/packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-pkgconfig.patch b/packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-pkgconfig.patch
new file mode 100644
index 0000000000..c0c9cf8512
--- /dev/null
+++ b/packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-pkgconfig.patch
@@ -0,0 +1,12 @@
+diff -Naur vdr-plugin-restfulapi-0.2.1.4/Makefile vdr-plugin-restfulapi-0.2.1.4.patch/Makefile
+--- vdr-plugin-restfulapi-0.2.1.4/Makefile	2015-03-18 23:12:01.000000000 +0100
++++ vdr-plugin-restfulapi-0.2.1.4.patch/Makefile	2016-01-07 05:24:24.036888492 +0100
+@@ -49,7 +49,7 @@
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+-LIBS    += $(shell cxxtools-config --libs) -lcxxtools-http
++LIBS += $(shell pkg-config --libs cxxtools-http cxxtools)
+ CONFDIR  = $(call PKGCFG,configdir)
+ PLGCONFDIR = $(CONFDIR)/plugins/$(PLUGIN)
+ 
diff --git a/packages/multimedia/vdr-satip/patches/vdr-satip-pkgconfig.patch b/packages/multimedia/vdr-satip/patches/vdr-satip-pkgconfig.patch
new file mode 100644
index 0000000000..c7d7f4a3ab
--- /dev/null
+++ b/packages/multimedia/vdr-satip/patches/vdr-satip-pkgconfig.patch
@@ -0,0 +1,12 @@
+diff -Naur satip-2.2.2/Makefile satip-2.2.2.patch/Makefile
+--- satip-2.2.2/Makefile	2015-04-26 03:20:00.000000000 +0200
++++ satip-2.2.2.patch/Makefile	2016-01-07 07:33:20.588462880 +0100
+@@ -53,7 +53,7 @@
+ 
+ ### Libraries
+ 
+-LIBS = $(shell curl-config --libs)
++LIBS = $(shell pkg-config --libs libcurl)
+ 
+ ### Includes and Defines (add further entries here):
+ 
diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index 65cbcc7d27..4a798ead49 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bluez"
-PKG_VERSION="5.36"
+PKG_VERSION="5.37"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/print/freetype/package.mk b/packages/print/freetype/package.mk
index 6cc9d9dd1d..d34ee9507b 100644
--- a/packages/print/freetype/package.mk
+++ b/packages/print/freetype/package.mk
@@ -47,7 +47,6 @@ pre_configure_target() {
 
 post_makeinstall_target() {
   $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/freetype-config
-  cp $SYSROOT_PREFIX/usr/bin/freetype-config $ROOT/$TOOLCHAIN/bin
   ln -v -sf $SYSROOT_PREFIX/usr/include/freetype2 $SYSROOT_PREFIX/usr/include/freetype
 
   rm -rf $INSTALL/usr/bin
diff --git a/packages/security/libgcrypt/package.mk b/packages/security/libgcrypt/package.mk
index 59a2d4312f..617b356a35 100644
--- a/packages/security/libgcrypt/package.mk
+++ b/packages/security/libgcrypt/package.mk
@@ -32,11 +32,11 @@ PKG_LONGDESC="Libgcrypt is a general purpose cryptographic library based on the
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-asm --with-gnu-ld"
+PKG_CONFIGURE_OPTS_TARGET="--disable-asm --with-gnu-ld --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr"
 
 post_makeinstall_target() {
-  sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i src/libgcrypt-config
-  cp src/libgcrypt-config $ROOT/$TOOLCHAIN/bin
+  sed -e "s:\(['= ]\)\"/usr:\\1\"$SYSROOT_PREFIX/usr:g" -i src/$PKG_NAME-config
+  cp src/$PKG_NAME-config $SYSROOT_PREFIX/usr/bin
 
   rm -rf $INSTALL/usr/bin
 }
diff --git a/packages/security/libgpg-error/package.mk b/packages/security/libgpg-error/package.mk
index 19d49254d4..f92631dba5 100644
--- a/packages/security/libgpg-error/package.mk
+++ b/packages/security/libgpg-error/package.mk
@@ -63,5 +63,5 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/share
 
   sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i src/gpg-error-config
-  cp src/gpg-error-config $ROOT/$TOOLCHAIN/bin
+  cp src/gpg-error-config $SYSROOT_PREFIX/usr/bin
 }
diff --git a/packages/sysutils/libhid/patches/libhid-use_pkgconfig.patch b/packages/sysutils/libhid/patches/libhid-use_pkgconfig.patch
new file mode 100644
index 0000000000..0d38057681
--- /dev/null
+++ b/packages/sysutils/libhid/patches/libhid-use_pkgconfig.patch
@@ -0,0 +1,14 @@
+diff -Naur libhid-0.2.16/m4/md_check_libusb018b.m4 libhid-0.2.16.patch/m4/md_check_libusb018b.m4
+--- libhid-0.2.16/m4/md_check_libusb018b.m4	2004-05-26 02:37:41.000000000 +0200
++++ libhid-0.2.16.patch/m4/md_check_libusb018b.m4	2016-01-10 00:07:24.000000000 +0100
+@@ -2,8 +2,8 @@
+   [
+     AC_CHECK_HEADERS([usb.h])
+ 
+-    LIBUSB_CFLAGS="`libusb-config --cflags`"
+-    LIBUSB_LIBS="`libusb-config --libs`"
++    LIBUSB_CFLAGS="`pkg-config --cflags libusb`"
++    LIBUSB_LIBS="`pkg-config --libs libusb`"
+ 
+     AC_SUBST(LIBUSB_CFLAGS)
+     AC_SUBST(LIBUSB_LIBS)
diff --git a/packages/sysutils/libusb-compat/package.mk b/packages/sysutils/libusb-compat/package.mk
index 5cf937d99d..cf706e72f0 100644
--- a/packages/sysutils/libusb-compat/package.mk
+++ b/packages/sysutils/libusb-compat/package.mk
@@ -36,8 +36,5 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-log --disable-debug-log --disable-examples-
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
-  sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \
-      -i $SYSROOT_PREFIX/usr/bin/libusb-config
-
-  mv $SYSROOT_PREFIX/usr/bin/libusb-config $ROOT/$TOOLCHAIN/bin
+  sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/libusb-config
 }
diff --git a/packages/textproc/libxml2/package.mk b/packages/textproc/libxml2/package.mk
index 11ac887556..fbc8635918 100644
--- a/packages/textproc/libxml2/package.mk
+++ b/packages/textproc/libxml2/package.mk
@@ -43,10 +43,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_ansidecl_h=no \
              --without-lzma"
 
 post_makeinstall_target() {
-  $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \
-    $SYSROOT_PREFIX/usr/bin/xml2-config
-
-  mv $SYSROOT_PREFIX/usr/bin/xml2-config $ROOT/$TOOLCHAIN/bin
+  $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/xml2-config
 
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/lib/xml2Conf.sh
diff --git a/packages/textproc/libxslt/package.mk b/packages/textproc/libxslt/package.mk
index 68b7f88bd9..d2b12d6359 100644
--- a/packages/textproc/libxslt/package.mk
+++ b/packages/textproc/libxslt/package.mk
@@ -36,11 +36,11 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_ansidecl_h=no \
                            --enable-static \
                            --disable-shared \
                            --without-python \
+                           --with-libxml-prefix=$SYSROOT_PREFIX/usr \
                            --without-crypto"
 
 post_makeinstall_target() {
-  $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $INSTALL/usr/bin/xslt-config
-  mv $INSTALL/usr/bin/xslt-config $ROOT/$TOOLCHAIN/bin
+  $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/xslt-config
 
   rm -rf $INSTALL/usr/bin/xsltproc
   rm -rf $INSTALL/usr/lib/xsltConf.sh
diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk
index e57d541176..6a6db373b6 100644
--- a/packages/web/curl/package.mk
+++ b/packages/web/curl/package.mk
@@ -101,5 +101,4 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin/curl-config
 
   sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/curl-config
-  mv $SYSROOT_PREFIX/usr/bin/curl-config $ROOT/$TOOLCHAIN/bin
 }
diff --git a/packages/web/libmicrohttpd/package.mk b/packages/web/libmicrohttpd/package.mk
index 9166dd5f66..f7afeb5128 100644
--- a/packages/web/libmicrohttpd/package.mk
+++ b/packages/web/libmicrohttpd/package.mk
@@ -35,7 +35,8 @@ PKG_AUTORECONF="yes"
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
                            --enable-static \
                            --disable-curl \
-                           --disable-https"
+                           --disable-https \
+                           --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr"
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index a087be84bb..1e9acc16b2 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -1449,8 +1449,9 @@ CONFIG_E1000E=y
 CONFIG_IGB=y
 CONFIG_IGB_HWMON=y
 # CONFIG_IGBVF is not set
-# CONFIG_IXGB is not set
-# CONFIG_IXGBE is not set
+CONFIG_IXGB=y
+CONFIG_IXGBE=y
+CONFIG_IXGBE_HWMON=y
 # CONFIG_IXGBEVF is not set
 # CONFIG_I40E is not set
 # CONFIG_I40EVF is not set
diff --git a/projects/Nvidia_Legacy/linux/linux.x86_64.conf b/projects/Nvidia_Legacy/linux/linux.x86_64.conf
index 2f7edbc670..4dac079b6e 100644
--- a/projects/Nvidia_Legacy/linux/linux.x86_64.conf
+++ b/projects/Nvidia_Legacy/linux/linux.x86_64.conf
@@ -1449,8 +1449,9 @@ CONFIG_E1000E=y
 CONFIG_IGB=y
 CONFIG_IGB_HWMON=y
 # CONFIG_IGBVF is not set
-# CONFIG_IXGB is not set
-# CONFIG_IXGBE is not set
+CONFIG_IXGB=y
+CONFIG_IXGBE=y
+CONFIG_IXGBE_HWMON=y
 # CONFIG_IXGBEVF is not set
 # CONFIG_I40E is not set
 # CONFIG_I40EVF is not set