diff --git a/packages/multimedia/vdr-satip/package.mk b/packages/multimedia/vdr-satip/package.mk
index ed5b48aadd..716fcd18dd 100644
--- a/packages/multimedia/vdr-satip/package.mk
+++ b/packages/multimedia/vdr-satip/package.mk
@@ -33,18 +33,25 @@ PKG_LONGDESC="vdr-satip is a SAT>IP plugin for VDR"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-pre_configure_target() {
-  export CFLAGS="$CFLAGS -fPIC"
-  export CXXFLAGS="$CXXFLAGS -fPIC"
-  export LDFLAGS="$LDFLAGS -fPIC"
-}
-
 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 \
     SATIP_USE_TINYXML=1 \
     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-satip/patches/vdr-satip-01_makefile.patch b/packages/multimedia/vdr-satip/patches/vdr-satip-01_makefile.patch
deleted file mode 100644
index fb96347382..0000000000
--- a/packages/multimedia/vdr-satip/patches/vdr-satip-01_makefile.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b4c3bec..3a687cb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,24 +19,16 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
- 
- ### 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_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
--LIBDIR = $(call PKGCFG,libdir)
--LOCDIR = $(call PKGCFG,locdir)
--PLGCFG = $(call PKGCFG,plgcfg)
--CFGDIR = $(call PKGCFG,configdir)
--#
- TMPDIR ?= /tmp
- 
- ### The compiler options:
- 
--export CFLAGS   = $(call PKGCFG,cflags)
--export CXXFLAGS = $(call PKGCFG,cxxflags)
-+include $(VDRDIR)/Make.global
- STRIP           ?= /bin/true
- 
- ### The version number of VDR's plugin API:
- 
--APIVERSION = $(call PKGCFG,apiversion)
-+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
- 
- ### Allow user defined options to overwrite defaults:
- 
-@@ -57,7 +49,7 @@ LIBS = $(shell curl-config --libs)
- 
- ### Includes and Defines (add further entries here):
- 
--INCLUDES +=
-+INCLUDES += -I$(VDRDIR)/include
- 
- DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
- 
-@@ -130,6 +122,7 @@ install-i18n: $(I18Nmsgs)
- $(SOFILE): $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
- 	@$(STRIP) $@
-+	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- install-lib: $(SOFILE)
- 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)