diff --git a/Makefile b/Makefile
index 0bcf9094..91fa1308 100644
--- a/Makefile
+++ b/Makefile
@@ -107,6 +107,8 @@ CC := gcc
 BISON := bison
 FLEX := flex
 AR := ar
+INSTALL := install
+LN := ln -sfn
 
 # Determine the default compiler flags
 # MODCFLAGS is to create in-kernel object files (modules); PROGFLAGS is to
diff --git a/i2c/Module.mk b/i2c/Module.mk
index cbf5b91d..cfdd450b 100644
--- a/i2c/Module.mk
+++ b/i2c/Module.mk
@@ -36,8 +36,8 @@ all :: all-i2c
 
 install-i2c:
 	$(MKDIR) $(MODDIR) $(SYSINCLUDEDIR)
-	install -o root -g root -m 644 $(I2CTARGETS) $(MODDIR)
-	install -o root -g root -m 644 $(I2CHEADERFILES) $(SYSINCLUDEDIR)
+	$(INSTALL) -o root -g root -m 644 $(I2CTARGETS) $(MODDIR)
+	$(INSTALL) -o root -g root -m 644 $(I2CHEADERFILES) $(SYSINCLUDEDIR)
 install :: install-i2c
 
 clean-i2c:
diff --git a/i2c/drivers/Module.mk b/i2c/drivers/Module.mk
index ecf3da10..f4130ca8 100644
--- a/i2c/drivers/Module.mk
+++ b/i2c/drivers/Module.mk
@@ -30,10 +30,7 @@ INCLUDEFILES += $(I2CDRIVERTARGETS:.o=.d)
 all-i2c-drivers: $(I2CDRIVERTARGETS)
 all :: all-i2c-drivers
 
-install-i2c-drivers:
-	$(MKDIR) $(MODDIR)
-	install -o root -g root -m 644 $(I2CDRIVERTARGETS) $(MODDIR)
-install :: install-i2c-drivers
+# No install rule: Our own eeprom.o driver is better :-)
 
 clean-i2c-drivers:
 	$(RM) $(I2CDRIVERTARGETS) $(I2CDRIVERTARGETS:.o=.d)
diff --git a/kernel/Module.mk b/kernel/Module.mk
index 3f573f0e..46abb93d 100644
--- a/kernel/Module.mk
+++ b/kernel/Module.mk
@@ -39,8 +39,8 @@ all :: all-src
 
 install-src:
 	$(MKDIR) $(MODDIR) $(SYSINCLUDEDIR)
-	install -o root -g root -m 644 $(SRCTARGETS) $(MODDIR)
-	install -o root -g root -m 644 $(SRCHEADERFILES) $(SYSINCLUDEDIR)
+	$(INSTALL) -o root -g root -m 644 $(SRCTARGETS) $(MODDIR)
+	$(INSTALL) -o root -g root -m 644 $(SRCHEADERFILES) $(SYSINCLUDEDIR)
 install :: install-src
 
 clean-src:
diff --git a/lib/Module.mk b/lib/Module.mk
index 5e699b97..d661f2fa 100644
--- a/lib/Module.mk
+++ b/lib/Module.mk
@@ -44,7 +44,7 @@ LIBHEADERFILES := $(MODULE_DIR)/error.h
 
 # How to create the shared library
 $(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS)
-	$(CC) -shared -Wl,-soname,$(LIBSONAME) -o $@ $^ -lc
+	$(CC) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc
 
 # And the static library
 $(MODULE_DIR)/$(LIBSTLIBNAME): $(LIBSTOBJECTS)
@@ -66,10 +66,10 @@ all :: all-lib
 
 install-lib:
 	$(MKDIR) $(LIBDIR) $(LIBINCLUDEDIR)
-	install -o root -g root -m 644 $(LIBTARGETS) $(LIBDIR)
+	$(INSTALL) -o root -g root -m 644 $(LIBTARGETS) $(LIBDIR)
 	$(LN) $(LIBSHLIBNAME) $(LIBDIR)/$(LIBSHSONAME)
 	$(LN) $(LIBSHSONAME) $(LIBDIR)/$(LIBSHBASENAME)
-	install -o root -g root -m 644 $(LIBHEADERFILES) $(LIBINCLUDEDIR)
+	$(INSTALL) -o root -g root -m 644 $(LIBHEADERFILES) $(LIBINCLUDEDIR)
 install :: install-lib
 
 clean-lib:
diff --git a/src/Module.mk b/src/Module.mk
index 3f573f0e..46abb93d 100644
--- a/src/Module.mk
+++ b/src/Module.mk
@@ -39,8 +39,8 @@ all :: all-src
 
 install-src:
 	$(MKDIR) $(MODDIR) $(SYSINCLUDEDIR)
-	install -o root -g root -m 644 $(SRCTARGETS) $(MODDIR)
-	install -o root -g root -m 644 $(SRCHEADERFILES) $(SYSINCLUDEDIR)
+	$(INSTALL) -o root -g root -m 644 $(SRCTARGETS) $(MODDIR)
+	$(INSTALL) -o root -g root -m 644 $(SRCHEADERFILES) $(SYSINCLUDEDIR)
 install :: install-src
 
 clean-src: