diff --git a/client/Makefile b/client/Makefile
index 905eeb5c3..638833e7c 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -3,13 +3,15 @@ SUBDIRS = doc po
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
+PYTHON_SITEDIR = $(LIBDIR)
 DESTDIR = 
 
 all:
 	for d in $(SUBDIRS); do $(MAKE) -C $$d; done
 
 install:
-	install -d $(DESTDIR)/$(LIBDIR)/entropy/client/solo/commands
+	install -d $(DESTDIR)/$(LIBDIR)/entropy/client
+	install -d $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/client/solo/commands
 	install -d -m 775 $(DESTDIR)/etc/entropy
 	install -d $(DESTDIR)$(BINDIR)
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
@@ -17,8 +19,8 @@ install:
 	# copying portage bashrc
 	install -m 644 ../conf/client.conf $(DESTDIR)/etc/entropy/
 
-	install -m 644 solo/*.py $(DESTDIR)/$(LIBDIR)/entropy/client/solo/
-	install -m 644 solo/commands/*.py $(DESTDIR)/$(LIBDIR)/entropy/client/solo/commands/
+	install -m 644 solo/*.py $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/client/solo/
+	install -m 644 solo/commands/*.py $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/client/solo/commands/
 	install -m 644 revision $(DESTDIR)/$(LIBDIR)/entropy/client/
 	install -m 755 equo.py $(DESTDIR)/$(BINDIR)/equo
 	install -m 755 kernel-switcher $(DESTDIR)/$(BINDIR)/
diff --git a/lib/Makefile b/lib/Makefile
index 4b060e44d..5d9cfb583 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,6 +4,7 @@ PREFIX = /usr
 VARDIR = /var
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
+PYTHON_SITEDIR = $(LIBDIR)
 TMPFILESDIR = /usr/lib/tmpfiles.d
 DESTDIR = 
 
@@ -11,14 +12,15 @@ all:
 	for d in $(SUBDIRS); do $(MAKE) -C $$d; done
 
 install:
-	install -d $(DESTDIR)/$(LIBDIR)/entropy/lib
+	install -d $(DESTDIR)/$(LIBDIR)/entropy/lib/entropy
+	install -d $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/lib
 	install -d $(DESTDIR)$(PREFIX)/sbin
 	install -d $(DESTDIR)$(BINDIR)
 	install -d -m 775 $(DESTDIR)/etc/entropy
 	install -d $(DESTDIR)/etc/env.d
 	install -d $(DESTDIR)/etc/init.d
 	install -d $(DESTDIR)/etc/logrotate.d
-	install -d $(DESTDIR)/$(LIBDIR)/entropy/services
+	install -d $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/services
 	install -d $(DESTDIR)/$(TMPFILESDIR)
 
 	# Empty directories that should be created and kept
@@ -35,9 +37,11 @@ install:
 	touch $(DESTDIR)/$(VARDIR)/log/entropy/.keep
 
 	chmod +x entropy/spm/plugins/interfaces/portage_plugin/env_sourcer.sh
-	cp -Ra entropy $(DESTDIR)/$(LIBDIR)/entropy/lib/
+	cp -Ra entropy $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/lib/
+	rm $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/lib/entropy/revision
+	install -m 644 entropy/revision $(DESTDIR)/$(LIBDIR)/entropy/lib/entropy/
 
-	ln -sf lib $(DESTDIR)/$(LIBDIR)/entropy/libraries
+	ln -sf lib $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/libraries
 	install -m 755 ../misc/entropy.sh $(DESTDIR)$(PREFIX)/sbin/
 	install -m 755 ../misc/entropy_hwgen.sh $(DESTDIR)$(BINDIR)/
 	install -m 644 ../misc/entropy.logrotate $(DESTDIR)/etc/logrotate.d/entropy
@@ -58,7 +62,7 @@ install:
 	install -m 644 ../misc/05entropy.envd $(DESTDIR)/etc/env.d/05entropy
 
 	install -m 644 ../docs/COPYING $(DESTDIR)/$(LIBDIR)/entropy/
-	cp ../entropy_path_loader $(DESTDIR)/$(LIBDIR)/entropy/ -Ra
+	cp ../entropy_path_loader $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/ -Ra
 
 	install -m 644 ../conf/entropy-tmpfiles.d.conf $(DESTDIR)/$(TMPFILESDIR)/entropy.conf
 
diff --git a/lib/kswitch/Makefile b/lib/kswitch/Makefile
index cafd7d392..00475e992 100644
--- a/lib/kswitch/Makefile
+++ b/lib/kswitch/Makefile
@@ -1,13 +1,14 @@
 PREFIX ?= /usr
 BINDIR ?= $(PREFIX)/bin
 LIBDIR ?= $(PREFIX)/lib
+PYTHON_SITEDIR ?= $(LIBDIR)
 DESTDIR ?= 
 
 all:
 
 
 install:
-	install -d $(DESTDIR)/$(LIBDIR)/entropy/lib/kswitch
-	install -m 644 *.py $(DESTDIR)/$(LIBDIR)/entropy/lib/kswitch/
+	install -d $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/lib/kswitch
+	install -m 644 *.py $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/lib/kswitch/
 
 clean:
diff --git a/magneto/Makefile b/magneto/Makefile
index 97fc64ee0..ffc56068b 100644
--- a/magneto/Makefile
+++ b/magneto/Makefile
@@ -6,6 +6,7 @@ ICONDIR = data/icons
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
+PYTHON_SITEDIR = $(LIBDIR)
 DESTDIR =
 
 all:
@@ -13,11 +14,11 @@ all:
 magneto-core-install:
 	mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps/magneto
 	mkdir -p $(DESTDIR)$(PREFIX)/share/magneto/icons
-	mkdir -p $(DESTDIR)/$(LIBDIR)/entropy/magneto/magneto/core
+	mkdir -p $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/magneto/magneto/core
 	install -m644 src/magneto/*.py \
-		$(DESTDIR)/$(LIBDIR)/entropy/magneto/magneto/.
+		$(DESTDIR)/$(PYTHON_SITEDIR)/entropy/magneto/magneto/.
 	install -m644 src/magneto/core/*.py \
-		$(DESTDIR)/$(LIBDIR)/entropy/magneto/magneto/core/.
+		$(DESTDIR)/$(PYTHON_SITEDIR)/entropy/magneto/magneto/core/.
 	install -m644 $(PIXDIR)/* $(DESTDIR)$(PREFIX)/share/pixmaps/magneto/.
 	install -m644 $(ICONDIR)/* $(DESTDIR)$(PREFIX)/share/magneto/icons/.
 
@@ -25,7 +26,6 @@ magneto-loader-install:
 	mkdir -p $(DESTDIR)/etc/xdg/autostart
 	mkdir -p $(DESTDIR)$(BINDIR)
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
-	mkdir -p $(DESTDIR)/$(LIBDIR)/entropy/magneto
 	install -m644 $(MISCDIR)/*.desktop $(DESTDIR)/etc/xdg/autostart/.
 	install -m644 $(MISCDIR)/*.desktop \
 		$(DESTDIR)$(PREFIX)/share/applications/.
@@ -34,24 +34,26 @@ magneto-loader-install:
 
 magneto-gtk-install:
 	mkdir -p $(DESTDIR)/$(LIBDIR)/entropy/magneto/magneto/gtk
+	mkdir -p $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/magneto/magneto/gtk
 	install -m644 src/magneto/gtk/*.py \
-		$(DESTDIR)/$(LIBDIR)/entropy/magneto/magneto/gtk/.
+		$(DESTDIR)/$(PYTHON_SITEDIR)/entropy/magneto/magneto/gtk/.
 	install -m644 src/magneto/gtk/*.glade \
 		$(DESTDIR)/$(LIBDIR)/entropy/magneto/magneto/gtk/.
 
 magneto-gtk3-install:
 	mkdir -p $(DESTDIR)/$(LIBDIR)/entropy/magneto/magneto/gtk3
+	mkdir -p $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/magneto/magneto/gtk3
 	install -m644 src/magneto/gtk3/*.py \
-		$(DESTDIR)/$(LIBDIR)/entropy/magneto/magneto/gtk3/.
+		$(DESTDIR)/$(PYTHON_SITEDIR)/entropy/magneto/magneto/gtk3/.
 	install -m644 src/magneto/gtk3/*.ui \
 		$(DESTDIR)/$(LIBDIR)/entropy/magneto/magneto/gtk3/.
 
 magneto-kde-install:
 
-	mkdir -p $(DESTDIR)/$(LIBDIR)/entropy/magneto/magneto/qt5
+	mkdir -p $(DESTDIR)/$(PYTHON_SITEDIR)/entropy/magneto/magneto/qt5
 	mkdir -p $(DESTDIR)$(PREFIX)/share/apps/magneto
 	install -m644 src/magneto/qt5/*.py \
-		$(DESTDIR)/$(LIBDIR)/entropy/magneto/magneto/qt5/.
+		$(DESTDIR)/$(PYTHON_SITEDIR)/entropy/magneto/magneto/qt5/.
 	# install Magneto notification service
 	install -m644 $(MISCDIR)/magneto.notifyrc \
 		$(DESTDIR)$(PREFIX)/share/apps/magneto/.
diff --git a/matter/Makefile b/matter/Makefile
index 115274e4b..4ae21aeb5 100644
--- a/matter/Makefile
+++ b/matter/Makefile
@@ -1,21 +1,22 @@
 SUBDIRS = 
 PREFIX = /usr
 LIBDIR = $(PREFIX)/lib
+PYTHON_SITEDIR = $(LIBDIR)
 SBINDIR = $(PREFIX)/sbin
 DESTDIR = 
-MATTERDIR = $(DESTDIR)$(LIBDIR)/matter
+MATTER_PYDIR = $(DESTDIR)$(PYTHON_SITEDIR)/matter
 
 all:
 	for d in $(SUBDIRS); do $(MAKE) -C $$d; done
 
 install:
-	mkdir -p $(MATTERDIR)/matter
-	mkdir -p $(MATTERDIR)/matter/binpms
+	mkdir -p $(MATTER_PYDIR)/matter
+	mkdir -p $(MATTER_PYDIR)/matter/binpms
 	mkdir -p $(DESTDIR)$(SBINDIR)
 
-	install -m 644 matter/*.py $(MATTERDIR)/matter/
+	install -m 644 matter/*.py $(MATTER_PYDIR)/matter/
 	install -m 644 matter/binpms/__init__.py \
-		$(MATTERDIR)/matter/binpms/
+		$(MATTER_PYDIR)/matter/binpms/
 
 	install -m 755 matter_app.py $(DESTDIR)$(SBINDIR)/matter
 	install -m 755 antimatter.py $(DESTDIR)$(SBINDIR)/antimatter
@@ -23,16 +24,16 @@ install:
 	for d in $(SUBDIRS); do $(MAKE) -C $$d install; done
 
 base-install:
-	mkdir -p $(MATTERDIR)/matter/binpms
+	mkdir -p $(MATTER_PYDIR)/matter/binpms
 
 	install -m 644 matter/binpms/base.py \
-		$(MATTERDIR)/matter/binpms/
+		$(MATTER_PYDIR)/matter/binpms/
 
 entropysrv-install:
-	mkdir -p $(MATTERDIR)/matter/binpms
+	mkdir -p $(MATTER_PYDIR)/matter/binpms
 
 	install -m 644 matter/binpms/entropysrv.py \
-		$(MATTERDIR)/matter/binpms/
+		$(MATTER_PYDIR)/matter/binpms/
 
 clean:
 	for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done
diff --git a/rigo/Makefile b/rigo/Makefile
index d4f61257b..0f84f3491 100644
--- a/rigo/Makefile
+++ b/rigo/Makefile
@@ -2,7 +2,8 @@ SUBDIRS = data po
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
-RIGODIR = $(LIBDIR)/rigo
+PYTHON_SITEDIR = $(LIBDIR)
+RIGO_PYDIR = $(PYTHON_SITEDIR)/rigo
 DESTDIR =
 
 all:
@@ -10,29 +11,29 @@ all:
 
 install:
 	install -d $(DESTDIR)$(BINDIR)/
-	install -d $(DESTDIR)$(RIGODIR)/rigo/ \
-		$(DESTDIR)$(RIGODIR)/rigo/controllers \
-		$(DESTDIR)$(RIGODIR)/rigo/models \
-		$(DESTDIR)$(RIGODIR)/rigo/ui/gtk3/controllers \
-		$(DESTDIR)$(RIGODIR)/rigo/ui/gtk3/models \
-		$(DESTDIR)$(RIGODIR)/rigo/ui/gtk3/widgets \
+	install -d $(DESTDIR)$(RIGO_PYDIR)/rigo/ \
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/controllers \
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/models \
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/ui/gtk3/controllers \
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/ui/gtk3/models \
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/ui/gtk3/widgets \
 
-	install -m 644 $(wildcard rigo/*.py) $(DESTDIR)$(RIGODIR)/rigo/
+	install -m 644 $(wildcard rigo/*.py) $(DESTDIR)$(RIGO_PYDIR)/rigo/
 	install -m 644 $(wildcard rigo/models/*.py) \
-		$(DESTDIR)$(RIGODIR)/rigo/models/
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/models/
 	install -m 644 $(wildcard rigo/controllers/*.py) \
-		$(DESTDIR)$(RIGODIR)/rigo/controllers/
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/controllers/
 	install -m 644 $(wildcard rigo/ui/*.py) \
-		$(DESTDIR)$(RIGODIR)/rigo/ui/
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/ui/
 	install -m 644 $(wildcard rigo/ui/gtk3/*.py) \
-		$(DESTDIR)$(RIGODIR)/rigo/ui/gtk3/
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/ui/gtk3/
 
 	install -m 644 $(wildcard rigo/ui/gtk3/models/*.py) \
-		$(DESTDIR)$(RIGODIR)/rigo/ui/gtk3/models/
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/ui/gtk3/models/
 	install -m 644 $(wildcard rigo/ui/gtk3/controllers/*.py) \
-		$(DESTDIR)$(RIGODIR)/rigo/ui/gtk3/controllers/
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/ui/gtk3/controllers/
 	install -m 644 $(wildcard rigo/ui/gtk3/widgets/*.py) \
-		$(DESTDIR)$(RIGODIR)/rigo/ui/gtk3/widgets/
+		$(DESTDIR)$(RIGO_PYDIR)/rigo/ui/gtk3/widgets/
 
 	install -m 755 rigo_app.py $(DESTDIR)$(BINDIR)/rigo
 	install -d $(DESTDIR)/usr/share/applications
diff --git a/rigo/RigoDaemon/Makefile b/rigo/RigoDaemon/Makefile
index 23eb1860f..155cabcc8 100644
--- a/rigo/RigoDaemon/Makefile
+++ b/rigo/RigoDaemon/Makefile
@@ -2,6 +2,7 @@ SUBDIRS = dbus polkit
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
+PYTHON_SITEDIR = $(LIBDIR)
 LIBEXECDIR = $(PREFIX)/libexec
 DESTDIR = 
 
@@ -10,8 +11,8 @@ all:
 
 install:
 	install -d $(DESTDIR)$(LIBEXECDIR)
-	install -d $(DESTDIR)$(LIBDIR)/rigo/RigoDaemon
-	install -m 644 $(wildcard *.py) $(DESTDIR)$(LIBDIR)/rigo/RigoDaemon/
+	install -d $(DESTDIR)$(PYTHON_SITEDIR)/rigo/RigoDaemon
+	install -m 644 $(wildcard *.py) $(DESTDIR)$(PYTHON_SITEDIR)/rigo/RigoDaemon/
 	install -m 755 app/RigoDaemon_app.py $(DESTDIR)$(LIBEXECDIR)/
 	for d in $(SUBDIRS); do $(MAKE) -C $$d install; done
 
diff --git a/server/Makefile b/server/Makefile
index 1cedd09c2..6eb92bde5 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -2,19 +2,20 @@ SUBDIRS = doc po
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
+PYTHON_SITEDIR = $(LIBDIR)
 DESTDIR = 
 
 all:
 	for d in $(SUBDIRS); do $(MAKE) -C $$d; done
 
 install:
-	mkdir -p $(DESTDIR)$(LIBDIR)/entropy/server
+	mkdir -p $(DESTDIR)$(PYTHON_SITEDIR)/entropy/server
 	mkdir -p $(DESTDIR)/etc/entropy
 	mkdir -p $(DESTDIR)$(BINDIR)
 
 	install -m 644 ../conf/server.conf.example $(DESTDIR)/etc/entropy/
 
-	cp -R eit $(DESTDIR)$(LIBDIR)/entropy/server/
+	cp -R eit $(DESTDIR)$(PYTHON_SITEDIR)/entropy/server/
 	install -m 755 eit.py $(DESTDIR)$(BINDIR)/eit
 
 	for d in $(SUBDIRS); do $(MAKE) -C $$d install; done