diff --git a/bin/compile-nagios-plugins b/bin/compile-nagios-plugins
index 8173bd7642b166bc3f90a833aae904387c30f886..7488f6475b52c3bde2edff9ddabcc36df7f36647 100755
--- a/bin/compile-nagios-plugins
+++ b/bin/compile-nagios-plugins
@@ -7,6 +7,8 @@
 source_fragment set-prefix.sh
 source_fragment setup-env.sh
 
+run_hook compile-nagios-plugins-prehook.sh
+
 if [ -f ../nagios-plugins-*/Makefile ]
 then
     echo ../nagios-plugins-*/Makefile exists.  Not running configure. >&2
@@ -22,3 +24,5 @@ else
     echo Running make in ../nagios-plugins-* >&2
     (cd ../nagios-plugins-* && make)
 fi
+
+run_hook compile-nagios-plugins-posthook.sh
diff --git a/bin/compile-nrpe b/bin/compile-nrpe
index ee49a3d48969193377551c66e0b2527c41a418c2..7e975aa54b3dd8f81225d9a1451d79d27154bb71 100755
--- a/bin/compile-nrpe
+++ b/bin/compile-nrpe
@@ -7,6 +7,8 @@
 source_fragment set-prefix.sh
 source_fragment setup-env.sh
 
+run_hook compile-nrpe-prehook.sh
+
 if [ -f ../nrpe-*/Makefile ]
 then
     echo ../nrpe-*/Makefile exists.  Not running configure. >&2
@@ -23,3 +25,5 @@ else
     echo Running make in ../nrpe-* >&2
     (cd ../nrpe-* && make)
 fi
+
+run_hook compile-nrpe-posthook.sh
diff --git a/bin/install-local b/bin/install-local
index 1b1728f98ce914d0f229262a2526c94f151d08c7..965df9c02ac7f10959fcac60583c502ccda1436f 100755
--- a/bin/install-local
+++ b/bin/install-local
@@ -7,3 +7,4 @@ source_fragment set-prefix.sh
 source_fragment setup-env.sh
 
 make install PREFIX=$prefix || exit 1
+mkdir -p $prefix/etc
diff --git a/bin/install-nrpe b/bin/install-nrpe
index da580abeaad396b22c9e1dd33aef4ff84744650a..c4ef2a367b1fb1485973d6291f30b0d579a4dac5 100755
--- a/bin/install-nrpe
+++ b/bin/install-nrpe
@@ -7,6 +7,8 @@
 source_fragment set-prefix.sh
 source_fragment setup-env.sh
 
+run_hook install-nrpe-prehook.sh
+
 if [ -f ../nrpe-*/src/nrpe ]
 then :
 else
@@ -14,8 +16,6 @@ else
     exit 1
 fi
 
-run_hook install-nrpe-prehook.sh
-
 mkdir -p $prefix/bin $prefix/etc
 cp ../nrpe-*/src/nrpe $prefix/bin
 
diff --git a/bin/utils/functions.sh b/bin/utils/functions.sh
index eb8ee6e6f6c2b2a0aa96cab6041d8939d9d7c13f..88b0adaef2c1505d3dcedfdc67aa572765bb634c 100644
--- a/bin/utils/functions.sh
+++ b/bin/utils/functions.sh
@@ -75,3 +75,21 @@ tempfile () {
     echo /tmp/$1.$$ && exit 0
     exit 1
 }
+
+gentoo_add_use () {
+    package="$1"
+    use="$2"
+    fn=/etc/portage/package.use
+
+    if grep "^$package[ 	]" $fn >/dev/null
+    then
+	if grep "^$package[ 	].*$use\($\|[ 	]\)" $fn >/dev/null
+        then :
+	else
+	    echo Please add $use use flags to $package in $use. >&2
+	    exit 1
+	fi
+    else
+	echo $package $use >> $fn
+    fi
+}
diff --git a/rules/gentoo/config-nrpe.sh b/rules/gentoo/config-nrpe.sh
new file mode 100644
index 0000000000000000000000000000000000000000..117fe15f0d1e55f229d0ca92856efdf50e9becbd
--- /dev/null
+++ b/rules/gentoo/config-nrpe.sh
@@ -0,0 +1,4 @@
+rc-update -a nrpe default
+rm /etc/nagios/nrpe.cfg
+ln -s $prefix/etc/nrpe.cfg /etc/nagios/nrpe.cfg
+/etc/init.d/nrpe restart
diff --git a/rules/gentoo/nrpe-host-auto.sh b/rules/gentoo/nrpe-host-auto.sh
new file mode 100644
index 0000000000000000000000000000000000000000..584a7792d9903500cf627ea39547217f368eb769
--- /dev/null
+++ b/rules/gentoo/nrpe-host-auto.sh
@@ -0,0 +1,16 @@
+FILESYSTEMS=`tempfile nrpfs`
+trap "rm -f $FILESYSTEMS" 0
+
+> $prefix/etc/nrpe-host-auto.cfg
+awk < /etc/fstab \
+    '! ($1 ~ /\//) { next } 
+     $3 == "swap" || $3 == "nfs" { next } 
+     $4 ~ /noauto/ { next } 
+     { print $1, $2 }' \
+| while read dev mp
+  do
+    mpdash=`echo $mp | sed -e 's%^/$%/root%' -e 's%/%-%g'`
+    echo "command[check-disk$mpdash]=/usr/nagios/libexec/check_disk $dev" \
+	>> $prefix/etc/nrpe-host-auto.cfg
+    echo $mp
+  done > $FILESYSTEMS
diff --git a/site-rules/lysator/config-nrpe-posthook.sh b/site-rules/lysator/config-nrpe-posthook.sh
new file mode 100644
index 0000000000000000000000000000000000000000..985e3916ac15c6f64c28b464f2e68a0f21ae07e9
--- /dev/null
+++ b/site-rules/lysator/config-nrpe-posthook.sh
@@ -0,0 +1,4 @@
+echo
+echo BEGIN `hostname | sed 's/\..*//'` nagiosadmin
+sed 's/^/fs /' $FILESYSTEMS | sort
+echo END
diff --git a/site-rules/lysator/gentoo/compile-nagios-plugins-prehook.sh b/site-rules/lysator/gentoo/compile-nagios-plugins-prehook.sh
new file mode 100644
index 0000000000000000000000000000000000000000..ca916d098dabfe85979d791e4534bf1def02ef84
--- /dev/null
+++ b/site-rules/lysator/gentoo/compile-nagios-plugins-prehook.sh
@@ -0,0 +1 @@
+exit 0
diff --git a/site-rules/lysator/gentoo/compile-nrpe-prehook.sh b/site-rules/lysator/gentoo/compile-nrpe-prehook.sh
new file mode 100644
index 0000000000000000000000000000000000000000..ca916d098dabfe85979d791e4534bf1def02ef84
--- /dev/null
+++ b/site-rules/lysator/gentoo/compile-nrpe-prehook.sh
@@ -0,0 +1 @@
+exit 0
diff --git a/site-rules/lysator/gentoo/install-nagios-plugins-prehook.sh b/site-rules/lysator/gentoo/install-nagios-plugins-prehook.sh
new file mode 100644
index 0000000000000000000000000000000000000000..ca916d098dabfe85979d791e4534bf1def02ef84
--- /dev/null
+++ b/site-rules/lysator/gentoo/install-nagios-plugins-prehook.sh
@@ -0,0 +1 @@
+exit 0
diff --git a/site-rules/lysator/gentoo/install-nrpe-prehook.sh b/site-rules/lysator/gentoo/install-nrpe-prehook.sh
new file mode 100644
index 0000000000000000000000000000000000000000..3016900c7f8606eb0ac24327387e33e5556d10af
--- /dev/null
+++ b/site-rules/lysator/gentoo/install-nrpe-prehook.sh
@@ -0,0 +1,4 @@
+gentoo_add_use net-analyzer/nagios-nrpe -ssl
+
+emerge -uvakb nagios-nrpe || exit 1
+exit 0
diff --git a/site-rules/lysator/gentoo/os b/site-rules/lysator/gentoo/os
new file mode 100644
index 0000000000000000000000000000000000000000..23574f357858fd530ccc43f6cdae292c8c449ffc
--- /dev/null
+++ b/site-rules/lysator/gentoo/os
@@ -0,0 +1 @@
+gentoo
diff --git a/site-rules/lysator/gentoo/setup-env.sh b/site-rules/lysator/gentoo/setup-env.sh
new file mode 100644
index 0000000000000000000000000000000000000000..fd9b6b34380fbcd0e447b04621fd3a2cc862fb7f
--- /dev/null
+++ b/site-rules/lysator/gentoo/setup-env.sh
@@ -0,0 +1 @@
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
diff --git a/site-rules/lysator/solaris10/config-nrpe-posthook.sh b/site-rules/lysator/solaris10/config-nrpe-posthook.sh
index 45559be1c7addc3193f2450535f44d1d6821d2c1..05357dacc44e0d21ea3915f3124c90c745c62a2e 100755
--- a/site-rules/lysator/solaris10/config-nrpe-posthook.sh
+++ b/site-rules/lysator/solaris10/config-nrpe-posthook.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 echo
 echo BEGIN `hostname | sed 's/\..*//'` nagiosadmin
 sed 's/^/fs /' $FILESYSTEMS | sort