diff --git a/archive-imagefiles/scripts/tuxcald.init b/archive-imagefiles/scripts/tuxcald.init
deleted file mode 100644
index 7c5acd2e..00000000
--- a/archive-imagefiles/scripts/tuxcald.init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/globals
-
-case $1 in
-	start)
-		if [ -e /var/etc/.tuxcald ]; then
-			SHOWINFO "starting ..."
-			/bin/tuxcald
-		fi
-	;;
-	stop)
-		if [ -e /var/etc/.tuxcald ]; then
-			SHOWINFO "stopping ..."
-			pid=$(cat /var/run/tuxcald.pid 2>/dev/null)
-			test -n "$pid" && kill $pid || true
-		fi
-	;;
-	*)
-		echo "[$BASENAME] Usage: $0 {start|stop}"
-	;;
-esac
diff --git a/archive-imagefiles/scripts/tuxmail.onreadmail b/archive-imagefiles/scripts/tuxmail.onreadmail
deleted file mode 100644
index 21f456f9..00000000
--- a/archive-imagefiles/scripts/tuxmail.onreadmail
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-#
diff --git a/archive-imagefiles/scripts/tuxmaild.init b/archive-imagefiles/scripts/tuxmaild.init
deleted file mode 100644
index c9910729..00000000
--- a/archive-imagefiles/scripts/tuxmaild.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/globals
-
-case $1 in
-	start)
-		if [ -e /var/etc/.tuxmaild ]; then
-			SHOWINFO "starting ..."
-			/bin/tuxmaild
-			sleep 1
-		fi
-	;;
-	stop)
-		if [ -e /var/etc/.tuxmaild ]; then
-			SHOWINFO "stopping ..."
-			pid=$(cat /var/run/tuxmail.pid 2>/dev/null)
-			test -n "$pid" && kill $pid || true
-		fi
-	;;
-	*)
-		echo "[$BASENAME] Usage: $0 {start|stop}"
-	;;
-esac
diff --git a/make/plugins.mk b/make/plugins.mk
index 710616e8..7fa362c1 100644
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -363,13 +363,13 @@ $(BIN)/tuxcald: $(D)/freetype $(BIN) $(ETCINITD) $(VARCONFIG)
 		tuxcald.c \
 		\
 		-o $@ && \
-	install -m755 $(IMAGEFILES)/scripts/tuxcald.init $(ETCINITD)/tuxcald && \
+	install -m755 tuxcald $(ETCINITD)/
 	cd $(ETCINITD) && \
-	ln -sf tuxcald S99tuxcald && \
-	ln -sf tuxcald K01tuxcald && \
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal && \
-	mkdir -p $(VARCONFIG)/tuxcal && \
-	install -m644 tuxcal.conf $(VARCONFIG)/tuxcal/
+		ln -sf tuxcald S99tuxcald && \
+		ln -sf tuxcald K01tuxcald
+	install -d $(VARCONFIG)/tuxcal
+	install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal/tuxcal.conf $(VARCONFIG)/tuxcal/
+	install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal/tuxcal.notify $(VARCONFIG)/tuxcal/
 
 $(LIBPLUGINS)/tuxcal.so: $(LIBPLUGINS)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal && \
@@ -416,15 +416,13 @@ $(BIN)/tuxmaild: $(D)/freetype $(D)/openssl $(BIN) $(ETCINITD) $(VARCONFIG)
 		tuxmaild.c \
 		\
 		-o $@ && \
-	install -m755 $(IMAGEFILES)/scripts/tuxmaild.init $(ETCINITD)/tuxmaild && \
+	install -m755 tuxmaild $(ETCINITD)/
 	cd $(ETCINITD) && \
-	ln -sf tuxmaild S99tuxmaild && \
-	ln -sf tuxmaild K01tuxmaild && \
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail && \
-	mkdir -p $(VARCONFIG)/tuxmail && \
-	install -m644 tuxmail.conf $(VARCONFIG)/tuxmail/ && \
-	pushd $(IMAGEFILES)/scripts && \
-	install -m755 tuxmail.onreadmail $(VARCONFIG)/tuxmail/
+		ln -sf tuxmaild S99tuxmaild && \
+		ln -sf tuxmaild K01tuxmaild
+	install -d $(VARCONFIG)/tuxmail
+	install -m644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail/tuxmail.conf $(VARCONFIG)/tuxmail/
+	install -m755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail/tuxmail.onreadmail $(VARCONFIG)/tuxmail/
 
 $(LIBPLUGINS)/tuxmail.so: $(LIBPLUGINS)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail && \