diff --git a/HISTORY b/HISTORY
index a0490de..9f34afc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -256,3 +256,7 @@ VDR Plugin 'femon' Revision History
 2007-08-14: Version 1.2.0
 
 - Updated for vdr-1.5.7.
+
+2007-08-19: Version 1.2.1
+
+- Updated for vdr-1.5.8.
diff --git a/Makefile b/Makefile
index 0de6a3c..d62991e 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,10 @@ all-redirect: all
 
 OBJS = femon.o femonosd.o femonreceiver.o femoncfg.o femontools.o
 
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n
+
 ### Implicit rules:
 
 %.o: %.c
@@ -103,13 +107,11 @@ i18n: $(I18Nmo)
 	@mkdir -p $(LOCALEDIR)
 	for i in $(I18Ndirs); do\
 	    mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
-	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\
+	    cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
 	    done
 
 ### Targets:
 
-all: libvdr-$(PLUGIN).so i18n
-
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 ifndef FEMON_DEBUG
diff --git a/femon.c b/femon.c
index 26b0634..bf6ddaa 100644
--- a/femon.c
+++ b/femon.c
@@ -14,11 +14,11 @@
 #include "femonservice.h"
 #include "femontools.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10507
-#error "VDR-1.5.7 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10508
+#error "VDR-1.5.8 API version or greater is required!"
 #endif
 
-static const char VERSION[]       = "1.2.0";
+static const char VERSION[]       = "1.2.1";
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");
 
diff --git a/femonclient/vdr-femonclient-0.0.2.tgz b/femonclient/vdr-femonclient-0.0.2.tgz
deleted file mode 100644
index f24348e..0000000
Binary files a/femonclient/vdr-femonclient-0.0.2.tgz and /dev/null differ
diff --git a/femonclient/vdr-femonclient-0.0.3.tgz b/femonclient/vdr-femonclient-0.0.3.tgz
new file mode 100644
index 0000000..4d39ba3
Binary files /dev/null and b/femonclient/vdr-femonclient-0.0.3.tgz differ