diff --git a/packages/multimedia/vdr-epgsearch/package.mk b/packages/multimedia/vdr-epgsearch/package.mk
index e0c5bf7ef0..517ec16794 100644
--- a/packages/multimedia/vdr-epgsearch/package.mk
+++ b/packages/multimedia/vdr-epgsearch/package.mk
@@ -33,17 +33,24 @@ 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"
-}
-
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  make VDRDIR=$VDR_DIR \
+  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
+  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+
+  make \
     LIBDIR="." \
-    LOCALEDIR="./locale"
+    LOCDIR="./locale" \
+    all install-i18n
+}
+
+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/-plugin/}
+
+  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  $STRIP libvdr-*.so*
 }
 
 makeinstall_target() {
diff --git a/packages/multimedia/vdr-epgsearch/patches/vdr-epgsearch-01_makefile.patch b/packages/multimedia/vdr-epgsearch/patches/vdr-epgsearch-01_makefile.patch
deleted file mode 100644
index 0a7bb44e85..0000000000
--- a/packages/multimedia/vdr-epgsearch/patches/vdr-epgsearch-01_makefile.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 6bb1b96..118e379 100644
---- a/Makefile
-+++ b/Makefile
-@@ -62,21 +62,10 @@ VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ p
- 
- ### The directory environment:
- 
--# Use package data if installed...otherwise assume we're under the VDR source directory:
--PKGCFG   = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
--LIBDIR   = $(call PKGCFG,libdir)
--LOCDIR   = $(call PKGCFG,locdir)
--MANDIR   = $(call PKGCFG,mandir)
--CONFDIR  = $(call PKGCFG,configdir)
--BINDIR   = $(call PKGCFG,bindir)
--#
- TMPDIR ?= /tmp
- 
- ### The compiler options:
- 
--export CFLAGS   = $(call PKGCFG,cflags)
--export CXXFLAGS = $(call PKGCFG,cxxflags)
--
- ### configuring modules
- ifeq ($(AUTOCONFIG),1)
- 	ifeq (exists, $(shell pkg-config libpcre && echo exists))
-@@ -92,9 +81,11 @@ ifeq ($(AUTOCONFIG),1)
- 	endif
- endif
- 
-+include $(VDRDIR)/Make.global
-+
- ### The version number of VDR's plugin API:
- 
--APIVERSION = $(call PKGCFG,apiversion)
-+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
- 
- ### The name of the distribution archive:
- 
-@@ -103,7 +94,7 @@ PACKAGE = vdr-$(ARCHIVE)
- 
- ### Includes and Defines (add further entries here):
- 
--INCLUDES +=
-+INCLUDES += -I$(VDRDIR)/include
- 
- DEFINES += 
- 
-@@ -231,15 +222,19 @@ install-i18n: $(I18Nmsgs)
- 
- libvdr-$(PLUGIN).so: $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
-+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- libvdr-$(PLUGIN2).so: $(OBJS2)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS2) $(LIBS2) -o $@
-+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- libvdr-$(PLUGIN3).so: $(OBJS3)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS3) $(LIBS3) -o $@
-+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- libvdr-$(PLUGIN4).so: $(OBJS4)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS4) $(LIBS4) -o $@
-+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- createcats: createcats.o Makefile
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) createcats.o -o $@