diff --git a/HISTORY b/HISTORY
index 6ad27df..b4a0b00 100644
--- a/HISTORY
+++ b/HISTORY
@@ -217,3 +217,8 @@ VDR Plugin 'femon' Revision History
 2006-04-20: Version 0.9.9
 
 - Updated for vdr-1.3.47.
+
+2006-04-23: Version 0.9.10
+
+- Added STRIP option for Makefile (Thanks to Ville Skyttä).
+- Modified APIVERSION code in Makefile.
diff --git a/Makefile b/Makefile
index bd1a4a2..5bb2655 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,9 @@
 # NTSC on/off 
 #FEMON_NTSC = 1
 
+# Strip debug symbols?  Set eg. to /bin/true if not
+STRIP = strip
+
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
@@ -36,7 +39,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
@@ -85,7 +88,7 @@ all: libvdr-$(PLUGIN).so
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
 ifndef FEMON_DEBUG
-	@strip $@
+	@$(STRIP) $@
 endif
 	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
diff --git a/femon.h b/femon.h
index d81dec4..674e214 100644
--- a/femon.h
+++ b/femon.h
@@ -11,7 +11,7 @@
 
 #include <vdr/plugin.h>
 
-static const char VERSION[]       = "0.9.9";
+static const char VERSION[]       = "0.9.10";
 static const char DESCRIPTION[]   = "DVB Signal Information Monitor (OSD)";
 static const char MAINMENUENTRY[] = "Signal Information";
 
diff --git a/femonclient-0.0.1/Makefile b/femonclient-0.0.1/Makefile
index fe15918..05bc82e 100644
--- a/femonclient-0.0.1/Makefile
+++ b/femonclient-0.0.1/Makefile
@@ -30,7 +30,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive: