diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index c809aa99..615ab841 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -70,6 +70,12 @@ LIBMODE          ?= $(EXEMODE)
 LIBDIROWNER      ?= $(EXEDIROWNER)
 LIBDIRGROUP      ?= $(EXEDIRGROUP)
 LIBDIRMODE       ?= $(EXEDIRMODE)
+PIOWNER          ?= $(LIBOWNER)
+PIGROUP          ?= $(LIBGROUP)
+PIMODE           ?= $(LIBMODE)
+PIDIROWNER       ?= $(LIBDIROWNER)
+PIDIRGROUP       ?= $(LIBDIRGROUP)
+PIDIRMODE        ?= $(LIBDIRMODE)
 MAKEOWNER        ?= $(HDROWNER)
 MAKEGROUP        ?= $(HDRGROUP)
 MAKEMODE         ?= $(HDRMODE)
diff --git a/make/defs.mk b/make/defs.mk
index 91b72696..dff27be2 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -166,7 +166,7 @@ UPLOAD_URL_RPM_SRC     = rsync_ssh://ftp.jannet.de:/home/ftp/dat/pub/packages/rp
 
 # -- standard dirs and files for build and install
 
-INSTALLATION_FILE_TYPES= LIB HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG
+INSTALLATION_FILE_TYPES= LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG
 
 # -- CFG
 CONFIG_FILE           ?= $(CONFIG_DIR)/$(PROJECT).conf
@@ -223,7 +223,13 @@ INSTALLED_LIB_A        = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
 INSTALLED_ALL_LIBS     = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a))
 INSTALLED_LIB          = $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \
 	$(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS))
-BUILD_LIB             += $(LIB_SO) $(addprefix $(BUILD_LIBDIR)/,$(PLUGIN))
+BUILD_LIB             += $(LIB_SO)
+
+# -- PI
+BUILD_PIDIR            = $(BUILD_LIBDIR)
+BUILD_PI               = $(addprefix $(BUILD_PIDIR)/,$(PLUGIN))
+INSTALL_PIDIR          = $(INSTALL_LIBDIR)
+INSTALLED_PI           = $(addprefix $(INSTALL_PIDIR)/,$(PLUGIN))
 
 # -- EXE
 EXE_ALL               += $(EXE) $(wildcard *.a *.dll *.so *.so.*)
diff --git a/make/plugin-defs.mk b/make/plugin-defs.mk
index a7304745..86851c95 100644
--- a/make/plugin-defs.mk
+++ b/make/plugin-defs.mk
@@ -1,22 +1,21 @@
-IS_PLUGIN               = true
-
-PLUGIN_API             ?= $(notdir $(shell cd ..; pwd))
-PLUGIN_NAME            ?= $(notdir $(shell pwd))
-PLUGIN_PREFIX          ?= feedfs
+IS_PLUGIN                       = true
+PLUGIN_API                     ?= $(notdir $(shell cd ..; pwd))
+PLUGIN_NAME                    ?= $(notdir $(shell pwd))
+PLUGIN_PREFIX                  ?= feedfs
 ifneq ($(TARGET),mingw)
-PLUGIN_SUFFIX          ?= so
+PLUGIN_SUFFIX                  ?= so
 else
-PLUGIN_SUFFIX          ?= dll
+PLUGIN_SUFFIX                  ?= dll
 endif
 
-PLUGIN                 ?= $(PLUGIN_PREFIX)_$(PLUGIN_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX)
+PLUGIN_VERSION_AND_API          = $(PLUGIN_PREFIX)_$(PLUGIN_API)
+PLUGIN_VERSION_LIB_BASENAME     = $(PLUGIN_VERSION_AND_API)_version
+PLUGIN                         ?= $(PLUGIN_VERSION_AND_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX)
 
-PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_PREFIX)_$(PLUGIN_API)_version
-PLUGIN_VERSION_LIB      = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
-INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
+PLUGIN_VERSION_LIB              = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
+INSTALLED_PLUGIN_VERSION_LIB    = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
 
-CFLAGS                 += -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\"
-CPPFLAGS               += -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\"
-
-PROJECT_LDFLAGS        += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive
+CFLAGS                         += -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\"
+CPPFLAGS                       += -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\"
+PROJECT_LDFLAGS                += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive
 
diff --git a/make/plugin.mk b/make/plugin.mk
index 8e81d6a2..8ca16d41 100644
--- a/make/plugin.mk
+++ b/make/plugin.mk
@@ -11,7 +11,7 @@ include $(MODDIR)/make/depend.mk
 LOCAL_CPPFLAGS += -D_PLUGIN
 LOCAL_CFLAGS   += -D_PLUGIN
 
-all: build_LIB
-install: install_LIB
+all: build_PI
+install: install_PI
 clean: execlean localclean
 distclean: clean