diff -Nura zaptel-1.2.22.1/Makefile zaptel-1.2.22.1.gentoo/Makefile
--- zaptel-1.2.22.1/Makefile	2007-10-05 21:45:31.000000000 +0200
+++ zaptel-1.2.22.1.gentoo/Makefile	2007-12-30 20:50:40.000000000 +0100
@@ -108,7 +108,7 @@
 
 INSTALL_PREFIX	:= /usr
 
-CFLAGS+=-I. -O4 -g -fPIC -Wall
+CFLAGS+=-I. -Iinclude -g -fPIC -Wall
 ifneq (,$(findstring ppc,$(MACHINE)))
   CFLAGS	+= -fsigned-char
   KFLAGS	+= -msoft-float -fsigned-char
@@ -391,7 +391,8 @@
 else # DYNFS
   ifdef UDEVRULES
 	install -d $(DESTDIR)/etc/udev/rules.d
-	build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules
+	build_tools/genudevrules > zaptel.rules
+	install -D -m 644 zaptel.rules $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules
   else # !UDEVRULES
 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
   endif
@@ -406,7 +407,7 @@
 	tar -zxf mISDNuser.tar.gz
 	$(MAKE) -C mISDNuser install
 
-install: all devices install-modules install-programs firmware
+install: devices install-modules install-programs firmware
 	@echo "###################################################"
 	@echo "###"
 	@echo "### Zaptel installed successfully."
@@ -460,11 +461,10 @@
 	rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o
 endif
 	rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o
-	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
 
 install-libs: libs
 	install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
-	[ `id -u` = 0 ] && /sbin/ldconfig || :
+	[ `id -u` = 0 ] && /sbin/ldconfig -n $(DESTDIR)/usr/lib || :
 	rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)
 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
 		$(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
diff -Nura zaptel-1.2.22.1/build_tools/genmodconf zaptel-1.2.22.1.gentoo/build_tools/genmodconf
--- zaptel-1.2.22.1/build_tools/genmodconf	2007-07-11 20:58:09.000000000 +0200
+++ zaptel-1.2.22.1.gentoo/build_tools/genmodconf	2007-12-30 19:43:49.000000000 +0100
@@ -79,20 +79,6 @@
 
 echo Building ${target}...
 
-if [ "${1}" = "linux24" ]; then
-    for mod in ${3}; do
-	if ! grep -q "post-install ${mod} " ${target}; then
-	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
-	fi
-    done
-elif [ "${1}" = "linux26" ]; then
-    for mod in ${3}; do
-	if ! grep -q "install ${mod} " ${target}; then
-	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
-	fi
-    done
-fi
-
 if [ -z "${combined}" ]; then
     echo "***"
     echo "*** WARNING:"
diff -Nura zaptel-1.2.22.1/build_tools/genudevrules zaptel-1.2.22.1.gentoo/build_tools/genudevrules
--- zaptel-1.2.22.1/build_tools/genudevrules	2007-01-31 18:27:30.000000000 +0100
+++ zaptel-1.2.22.1.gentoo/build_tools/genudevrules	2007-12-30 19:44:15.000000000 +0100
@@ -22,10 +22,10 @@
 
 cat <<EOF
 # zaptel devices with ownership/permissions for running as non-root
-KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="asterisk", GROUP="asterisk", MODE="0660"
-KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
+KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="root", GROUP="dialout", MODE="0660"
+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
 EOF