diff --git a/app/fvwm/sample.fvwmrc/Makefile b/app/fvwm/sample.fvwmrc/Makefile
index aaa1b093c..24428f1b6 100644
--- a/app/fvwm/sample.fvwmrc/Makefile
+++ b/app/fvwm/sample.fvwmrc/Makefile
@@ -1,15 +1,19 @@
-# $OpenBSD: Makefile,v 1.3 2006/12/02 16:28:48 matthieu Exp $
+# $OpenBSD: Makefile,v 1.4 2007/03/25 19:35:56 aanriot Exp $
 
 .include "../Makefile.inc"
 
 NOOBJ=Yes
+OSRELEASE=`/sbin/sysctl -n kern.osrelease 2>&1`
+RM?=rm
 
 depend:
 
 all:
+	@sed -e "s,__osrelease__,${OSRELEASE}," \
+		${.CURDIR}/system.fvwmrc > .fvwmrc
 
 install:
-	${INSTALL} ${INSTALL_COPY} ${.CURDIR}/system.fvwmrc \
+	${INSTALL} ${INSTALL_COPY} .fvwmrc \
 		${DESTDIR}${FVWMLIBDIR}/.fvwmrc
 	${INSTALL} ${INSTALL_COPY} ${.CURDIR}/system.fvwm2rc \
 		${DESTDIR}${FVWMLIBDIR}
@@ -23,6 +27,7 @@ install:
 		${DESTDIR}${FVWMLIBDIR}
 
 clean:
+	${RM} -f .fvwmrc
 
 cleandir:
 
diff --git a/app/fvwm/sample.fvwmrc/system.fvwmrc b/app/fvwm/sample.fvwmrc/system.fvwmrc
index 90232f830..9ae80a82c 100644
--- a/app/fvwm/sample.fvwmrc/system.fvwmrc
+++ b/app/fvwm/sample.fvwmrc/system.fvwmrc
@@ -351,7 +351,7 @@ Key F8		A	M	CirculateDown
 *FvwmPagerFore white
 *FvwmPagerHilight #2d2d2d
 *FvwmPagerGeometry 80x60-1-1
-*FvwmPagerLabel 0 "OpenBSD 4.1"
+*FvwmPagerLabel 0 "OpenBSD __osrelease__"
 *FvwmPagerLabel 1 Maker
 *FvwmPagerLabel 2 Mail
 *FvwmPagerLabel 3 Matlab