--- isdn4k-utils/.config.rpm.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/.config.rpm	2013-11-23 12:47:59.064117681 +0100
@@ -5,16 +5,16 @@
 #
 # Code maturity level options
 #
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
 
 #
 # General configuration
 #
 CONFIG_BUILDX11=y
-CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_KERNELDIR='/usr/src/linux-2.4'
 CONFIG_BINDIR='/usr/bin'
-CONFIG_SBINDIR='/sbin'
-CONFIG_MANDIR='/usr/man'
+CONFIG_SBINDIR='/usr/sbin'
+CONFIG_MANDIR='/usr/share/man'
 CONFIG_RUNDIR='/var/run'
 CONFIG_LOCKDIR='/var/lock'
 CONFIG_LOCKFILE='LCK..'
@@ -23,11 +23,9 @@
 CONFIG_CALLERIDFILE='callerid.conf'
 CONFIG_USERCONFFILE='~/.isdn'
 CONFIG_COUNTRYCODE='49'
-CONFIG_AREACODE=''
+CONFIG_AREACODE='9999'
 CONFIG_COUNTRY_PREFIX='+'
 CONFIG_AREA_PREFIX='0'
-CONFIG_DATADIR='/usr/lib/isdn'
-CONFIG_LIB_AREACODE=y
 
 #
 # Runtime configuration tools
@@ -36,18 +34,20 @@
 CONFIG_ISDNCTRL_CONF=y
 CONFIG_ISDNCTRL_TIMRU=y
 CONFIG_IPROFD=y
+#CONFIG_DIVERTCTRL=y
 
 #
 # Card configuration tools
 #
-# CONFIG_TELESCTRL is not set
+CONFIG_TELESCTRL=y
 CONFIG_HISAXCTRL=y
 CONFIG_ICNCTRL=y
 # CONFIG_ICNCTRL_DEBUG is not set
 CONFIG_PCBITCTL=y
 CONFIG_AVMCAPICTRL=y
+#CONFIG_EICONCTRL=y
 CONFIG_LOOPCTRL=y
-CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux/drivers/isdn/isdnloop'
+CONFIG_LOOPCTRL_LOOPDIR='/usr/src/linux-2.4/drivers/isdn/isdnloop'
 # CONFIG_LOOPCTRL_DEBUG is not set
 
 #
@@ -64,14 +64,20 @@
 CONFIG_ISDNLOG_USERFILE='isdnlog.users'
 CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
 CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
-CONFIG_ISDNLOG_RELOADCMD='reload'
-CONFIG_ISDNLOG_STOPCMD='stop'
+CONFIG_ISDNLOG_RELOADCMD='/etc/rc.d/init.d/isdn restart'
+CONFIG_ISDNLOG_STOPCMD='/etc/rc.d/init.d/isdn stop'
 CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
 CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
 CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
 # CONFIG_ISDNLOG_POSTGRES is not set
 # CONFIG_ISDNLOG_MYSQLDB is not set
+# CONFIG_ISDNLOG_ORACLE is not set
 CONFIG_ISDN_LOG_DE=y
+CONFIG_ISDN_LOG_CC_DE=y
+CONFIG_ISDN_LOG_DEST_DE=y
+# CONFIG_ISDN_LOG_DEST_AT is not set
+# CONFIG_ISDN_LOG_DEST_NL is not set
+# CONFIG_ISDN_LOG_DEST_CH is not set
 CONFIG_IPPPSTATS=y
 CONFIG_XISDNLOAD=y
 CONFIG_XMONISDN=y
@@ -79,8 +85,8 @@
 #
 # Options for xmonisdn
 #
-CONFIG_XMONISDN_UPCMD='/sbin/netup'
-CONFIG_XMONISDN_DOWNCMD='/sbin/netdown'
+CONFIG_XMONISDN_UPCMD='/sbin/ifup'
+CONFIG_XMONISDN_DOWNCMD='/sbin/ifdown'
 
 #
 # Applications
@@ -94,23 +100,22 @@
 VBOX_LOGDIR='/var/log/vbox'
 VBOX_PIDDIR='/var/run'
 VBOX_LOCKDIR='/var/lock'
-VBOX_DOCDIR='/usr/doc/vbox'
-VBOX_TCL='tcl8.0'
+VBOX_DOCDIR='/usr/share/doc/vbox'
+VBOX_TCL='tcl8.5'
+# VBOX_SUSPEND_ID is not set
 CONFIG_IPPPD=y
 
 #
 # Options for ipppd
 #
-CONFIG_IPPPD_MSCHAP=y
+# CONFIG_IPPPD_MSCHAP is not set
+CONFIG_IPPP_FILTER=y
 # CONFIG_IPPPD_RADIUS is not set
 # CONFIG_RADIUS_WTMP_LOGGING is not set
 RADIUS_CLIENT_CONFIG_FILE=''
 CONFIG_CAPIFAX=y
 CONFIG_RCAPID=y
 
-#
-# Documentation
-#
-CONFIG_GENMAN=y
-CONFIG_FAQ=y
-CONFIG_FAQDIR='/usr/doc/faq/isdn4linux'
+# CAPI plugins
+CONFIG_PPPDCAPIPLUGIN=y
+
--- isdn4k-utils/ipppd/ccp.c.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/ipppd/ccp.c	2013-11-23 12:47:59.064117681 +0100
@@ -41,7 +41,7 @@
 
 #include "compressions.h"
 
-#if 0
+#if HAVE_LZSCOMP_H
 #include <linux/isdn_lzscomp.h>
 #else
 #include "../ipppcomp/isdn_lzscomp.h"
--- isdn4k-utils/ipppd/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/ipppd/Makefile.in	2013-11-23 12:49:30.400890185 +0100
@@ -15,10 +15,10 @@
 MANDIR        := @CONFIG_MANDIR@
 CC            := @CC@
 INSTALL       := @INSTALL@
-INSTALL_DIR   := $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN  := $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN   := $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA  := $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR   := $(INSTALL) -m 0755 -d
+INSTALL_SBIN  := $(INSTALL) -m 0700 
+INSTALL_BIN   := $(INSTALL) -m 0755
+INSTALL_DATA  := $(INSTALL) -m 0644
 RADIUS_CLIENT_CONFIG_FILE := @RADIUS_CLIENT_CONFIG_FILE@
 
 ifeq (@CONFIG_IPPPD_MSCHAP@,y)
@@ -73,7 +73,7 @@
 
 DEBUG_FLAGS   = @CONFIG_IPPPD_DEBUGFLAGS@
 COMPILE_FLAGS = @CFLAGS@
-CFLAGS        = -O2 -fomit-frame-pointer -Wall -DREQ_SYSOPTIONS=0
+CFLAGS        = $(RPM_OPT_FLAGS) -DREQ_SYSOPTIONS=0
 VER           = 2.2.0
 
 # it's a hack
--- isdn4k-utils/loop/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/loop/Makefile.in	2013-11-23 12:47:59.063117706 +0100
@@ -5,16 +5,16 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/loopctrl
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= loopctrl
 MODULES			= loopctrl.o
 MANPAGE			= loopctrl.8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils/imontty/Makefile.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/imontty/Makefile	2013-11-23 12:47:59.062117731 +0100
@@ -15,14 +15,14 @@
 	# Manual config standalone
 	#
 	CONFIG_SBINDRIR := /sbin
-	MAN8DIR         := /usr/man/man8
+	MAN8DIR         := /usr/share/man/man8
 endif
 
 INSTALL=install
-INSTALL_MAN=$(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_MAN=$(INSTALL) -m 0644
 MANPAGE=imontty.8
 
-CCFLAGS=-O2
+CCFLAGS=$(RPM_OPT_FLAGS) -I$(CONFIG_KERNELDIR)/include
 #CCFLAGS=-I$(ISDN_INCLUDE) -g
 
 # nothing to change behind this line
--- isdn4k-utils/iprofd/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/iprofd/Makefile.in	2013-11-23 12:47:59.062117731 +0100
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I@CONFIG_KERNELDIR@/include
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= iprofd
 MODULES			= iprofd.o
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils/avmb1/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/avmb1/Makefile.in	2013-11-23 12:47:59.061117756 +0100
@@ -5,7 +5,7 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
+CFLAGS			= $(RPM_OPT_FLAGS)
 LDFLAGS			= -L../lib @LIBS@
 INCLUDES		= -I.
 PROGRAMS		= avmcapictrl
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils/imon/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/imon/Makefile.in	2013-11-23 12:47:59.062117731 +0100
@@ -7,8 +7,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I@CONFIG_KERNELDIR@/include
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= imon
 MODULES			= imon.o
@@ -18,8 +18,8 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils/act2000/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/act2000/Makefile.in	2013-11-23 12:47:59.061117756 +0100
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/act2000
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= actctrl
@@ -18,9 +18,9 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 CC				= @CC@
--- isdn4k-utils/isdnctrl/Makefile.in.redhat	2013-11-23 12:47:59.062117731 +0100
+++ isdn4k-utils/isdnctrl/Makefile.in	2013-11-23 12:50:53.592861497 +0100
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I@CONFIG_KERNELDIR@/include
 LDFLAGS			= @LIBS@
 PROGRAM			= isdnctrl
 MODULES			= isdnctrl.o
@@ -15,8 +15,8 @@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC			= @CC@ -DVERSION=\"@I4LVERSION@\"
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
--- isdn4k-utils/xisdnload/Imakefile.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/xisdnload/Imakefile	2013-11-23 12:47:59.064117681 +0100
@@ -21,7 +21,7 @@
            OBJS = xisdnload.o
  OSMAJORVERSION = OSMajorVersion
  OSMINORVERSION = OSMinorVersion
-      DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
+      DEFINES = -D_GNU_SOURCE -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) -DREGEX_NUMBER
 
 AllTarget(xisdnload)
 NormalProgramTarget(xisdnload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
--- isdn4k-utils/icn/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/icn/Makefile.in	2013-11-23 12:47:59.062117731 +0100
@@ -5,8 +5,8 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/icn
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= icnctrl
@@ -17,9 +17,9 @@
 DATADIR			= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC				= @CC@
 COPTS			=
 
--- isdn4k-utils/areacode/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/areacode/Makefile.in	2013-11-23 12:47:59.061117756 +0100
@@ -12,7 +12,7 @@
 	# only ones that _really_ exist on _every_ system.
 	#
 	BUILDOPTS   := $(DATAOPTS)
-	INSTALLOPTS := $(DATAOPTS) INSTALL="install -o 0 -g 0 -m 644"
+	INSTALLOPTS := $(DATAOPTS) INSTALL="install -m 644"
 endif
 
 all: .depend
--- isdn4k-utils/rcapid/Makefile.am.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/rcapid/Makefile.am	2013-11-23 12:47:59.064117681 +0100
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils/isdnlog/samples/callerid.conf.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/samples/callerid.conf	2013-11-23 12:47:59.063117706 +0100
@@ -2,38 +2,31 @@
 # 
 # More information: See the isdnlog documentation
 
+#INTERFACE = ippp0      # Isdn network interface. This information  is  required
+                        # with the "-hx" / hangup="value" option.
+
+
 [MSN]
 NUMBER = 4711
 ALIAS  = Phone
 SI     = 1
 ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|H
-  PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
-}
+#START = {
+#  [FLAG]
+#  FLAGS = I|O|R|C|B|A|E|H
+#  PROGRAM = /bin/myprog \$1 \$2 \$3 Phone
+#}
 
 [MSN]
 NUMBER = 4711
 ALIAS  = HDLC
 SI     = 7
 ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|
-  PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
-}
-
-[MSN]
-NUMBER = 4712
-ALIAS  = Modem
-SI     = 1
-ZONE   = 1
-START = {
-  [FLAG]
-  FLAGS = I|O|R|C|B|A|E|H
-  PROGRAM = /bin/myprog \$1 \$2 \$3 Modem
-}
+#START = {
+#  [FLAG]
+#  FLAGS = I|O|R|C|B|A|E|
+#  PROGRAM = /bin/myprog \$1 \$2 \$3 HDLC @/home/user1/parameter
+#}
 
 [NUMBER]
 NUMBER = 01910
--- isdn4k-utils/isdnlog/tools/cdb/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/tools/cdb/Makefile.in	2013-11-23 12:51:38.509766289 +0100
@@ -20,7 +20,7 @@
 BINDIR:=$(DESTDIR)@prefix@/bin
 INCDIR:=$(DESTDIR)@prefix@/include
 
-CFLAGS:=-Wall -O2
+CFLAGS:=-Wall $(RPM_OPT_FLAGS)
 
 all: depend $(FILES)
 
@@ -45,7 +45,7 @@
 install-dirs:
 	install -d -m0755 $(MAN1DIR) $(MAN3DIR) $(LIBDIR) $(BINDIR) $(INCDIR)
 
-install:
+install: install-dirs
 	true
 	# install -m0755 $(BINS) $(BINDIR)
 	# install -m0644 $(MAN1) $(MAN1DIR)
--- isdn4k-utils/isdnlog/tools/Makefile.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/tools/Makefile	2013-11-23 12:47:59.065117655 +0100
@@ -1,4 +1,4 @@
-CC=gcc -m486 -O2 -Wall -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
+CC=gcc $(RPM_OPT_FLAGS) -DSTANDALONE -I. -I.. -I../isdnlog -I../connect -I../../lib
 #CC=gcc -m486 -O2 -g -pg -Wall -DSTANDALONE -I. -I.. -I../isdnlog
 
 all: rate-at
--- isdn4k-utils/isdnlog/tools/dest/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/tools/dest/Makefile.in	2013-11-23 12:47:59.063117706 +0100
@@ -6,7 +6,7 @@
 -include ../../../.config
 BZIP2			= @BZIP2@
 SHELL			= /bin/sh
-CFLAGS			= -Wall -g
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
 INCLUDES		=
 LDFLAGS			= @DBMLIB@
 export DBEXT		= @DBEXT@
@@ -20,9 +20,9 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_DATA		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
+INSTALL_DATA		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 DATADIR			= @datadir@
--- isdn4k-utils/isdnlog/tools/zone/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/tools/zone/Makefile.in	2013-11-23 12:47:59.063117706 +0100
@@ -5,7 +5,7 @@
 #
 BZIP2			= @BZIP2@
 SHELL			= /bin/sh
-CFLAGS			= -Wall -g
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
 INCLUDES		=
 LDFLAGS			= @DBMLIB@
 CDBEXTRALIBS		= @CDBEXTRALIBS@
@@ -20,8 +20,8 @@
 SBINDIR			= @CONFIG_SBINDIR@
 MAN8DIR			= $(MANDIR)/man8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM		= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM		= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 #CC			= @CC@ -V2.7.2.3
--- isdn4k-utils/isdnlog/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/isdnlog/Makefile.in	2013-11-23 12:47:59.063117706 +0100
@@ -1659,10 +1659,10 @@
 # autoconf isdnlog specific stuff
 #
 INSTALL			:= @INSTALL@
-INSTALL_DIR		:= $(INSTALL) -m 0755 -o 0 -g 0 -d
-INSTALL_SBIN		:= $(INSTALL) -m 0700 -o 0 -g 0
-INSTALL_BIN		:= $(INSTALL) -m 0755 -o 0 -g 0
-INSTALL_DATA		:= $(INSTALL) -m 0644 -o 0 -g 0
+INSTALL_DIR		:= $(INSTALL) -m 0755 -d
+INSTALL_SBIN		:= $(INSTALL) -m 0700
+INSTALL_BIN		:= $(INSTALL) -m 0755
+INSTALL_DATA		:= $(INSTALL) -m 0644
 
 BZIP2                   := @BZIP2@
 BUNZIP2                 := $(BZIP2) -f -d
@@ -1717,9 +1717,9 @@
 SUBDIRS     += $(LIBISDNDIR)
 endif
 
-# export CFLAGS  = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
+# export CFLAGS  = -Wall -pipe -frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
 
-export CFLAGS  = -Wall -pipe
+export CFLAGS  = -Wall $(RPM_OPT_FLAGS)
 ifndef _CC
 export _CC  = gcc
 endif
--- isdn4k-utils/capiinfo/Makefile.am.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/capiinfo/Makefile.am	2013-11-23 12:47:59.061117756 +0100
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils/Makefile.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/Makefile	2013-11-23 12:47:59.065117655 +0100
@@ -16,8 +16,8 @@
 # Following line is important for lib and isdnlog (sl).
 export ROOTDIR=$(shell pwd)
 
-ifeq (.config,$(wildcard .config))
-include .config
+ifeq (.config.h,$(wildcard .config.h))
+include .config.h
 do-it-all:      subtargets
 else
 CONFIGURATION = config
@@ -129,14 +129,8 @@
 
 install:
 	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done
-	@: || if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \
-	then \
-		/bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \
-	else \
-		sh scripts/makedev.sh $(DESTDIR) ; \
-	fi
 
-uninstall: rootperm
+uninstall:
 	set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done
 
 #
--- isdn4k-utils/divertctrl/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/divertctrl/Makefile.in	2013-11-23 12:47:59.061117756 +0100
@@ -5,16 +5,16 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2
-INCLUDES		= -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/divert
 DEFS			=
 LDFLAGS			= -L../lib @LIBS@
 PROGRAM			= divertctrl
 MODULES			= divertctrl.o
 MANPAGE			= divertctrl.8
 INSTALL			= @INSTALL@
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq (../.config,$(wildcard ../.config))
--- isdn4k-utils/capifax/Makefile.am.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/capifax/Makefile.am	2013-11-23 12:47:59.061117756 +0100
@@ -8,7 +8,7 @@
 			  stamp-h.in
 
 INCLUDES = -I../capi20 $(all_includes)
-CFLAGS = -Wall -O2
+CFLAGS = -Wall $(RPM_OPT_FLAGS)
 LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
 LDADD = -lcapi20
 
--- isdn4k-utils/capiinit/Makefile.am.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/capiinit/Makefile.am	2013-11-23 12:47:59.061117756 +0100
@@ -8,7 +8,7 @@
 			  stamp-h.in comperr core
 
 INCLUDES = $(all_includes)
-CFLAGS = -Wall -O2 -D_GNU_SOURCE # -g
+CFLAGS = -Wall -D_GNU_SOURCE $(RPM_OPT_FLAGS)
 LDFLAGS = $(all_libraries)
 LDADD = 
 
--- isdn4k-utils/hisax/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/hisax/Makefile.in	2013-11-23 12:47:59.062117731 +0100
@@ -6,7 +6,7 @@
 #
 #
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2 -I.
+CFLAGS			= -Wall $(RPM_OPT_FLAGS) -I. -I@CONFIG_KERNELDIR@/include
 LDFLAGS			= -L../lib @LIBS@
 PROGRAMS		=
 MODULES			= hisaxctrl.o
@@ -16,9 +16,9 @@
 DATADIR			= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 ifeq ("@CONFIG_HISAXCTRL@","y")
--- isdn4k-utils/doc/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/doc/Makefile.in	2013-11-23 12:47:59.062117731 +0100
@@ -9,7 +9,7 @@
 SED				= @SED@
 MANDIR			= @CONFIG_MANDIR@
 MANPAGES		= ttyI.4 isdninfo.4 isdn_audio.4 isdnctrl.4 isdn_cause.7
-INSTALL_MAN		= @INSTALL@ -o 0 -g 0 -m 0644
+INSTALL_MAN		= @INSTALL@ -m 0644
 prefix			= @prefix@
 
 %.1: %.man
--- isdn4k-utils/eicon/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/eicon/Makefile.in	2013-11-23 12:47:59.062117731 +0100
@@ -7,8 +7,8 @@
 #
 
 SHELL			= /bin/sh
-CFLAGS			= -Wall -O2 -DUNIX -DLINUX
-INCLUDES		= -I. -Iinclude
+CFLAGS			= -Wall -DUNIX -DLINUX $(RPM_OPT_FLAGS)
+INCLUDES		= -I. -Iinclude -I@CONFIG_KERNELDIR@/include -I@CONFIG_KERNELDIR@/drivers/isdn/eicon
 LDFLAGS			= -L../lib @LIBS@
 PROGRAMS		= 
 PROGRAM			= eiconctrl
@@ -23,9 +23,9 @@
 DATA_DIR		= @CONFIG_DATADIR@
 MANDIR			= @CONFIG_MANDIR@
 MAN8DIR			= $(MANDIR)/man8
-INSTALL_PROGRAM	= $(INSTALL) -o 0 -g 0 -m 0750
-INSTALL_DATA	= $(INSTALL) -o 0 -g 0 -m 0644
-INSTALL_MAN		= $(INSTALL) -o 0 -g 0 -m 0644
+INSTALL_PROGRAM	= $(INSTALL) -m 0750
+INSTALL_DATA	= $(INSTALL) -m 0644
+INSTALL_MAN		= $(INSTALL) -m 0644
 CC				= @CC@
 COPTS			= -DDATADIR=\"$(shell echo $(DESTDIR)$(DATA_DIR))\"
 
--- isdn4k-utils/vbox/examples/vboxgetty.conf.example.redhat	2013-11-23 12:47:59.064117681 +0100
+++ isdn4k-utils/vbox/examples/vboxgetty.conf.example	2013-11-23 12:53:01.601740005 +0100
@@ -20,12 +20,12 @@
 
 # Settings for port ttyI6
 
-port /dev/ttyI6
-  modeminit		ATZ&B512&E000000
-  user			vboxdaemonuser
-  group			users
-  spooldir		/var/spool/vbox/ttyI6
-  vboxconfig		/home/vboxdaemonuser/.vbox.conf
+#port /dev/ttyI6
+#  modeminit		ATZ&B512&E000000
+#  user			vboxdaemonuser
+#  group			users
+#  spooldir		/var/spool/vbox/ttyI6
+#  vboxconfig		/home/vboxdaemonuser/.vbox.conf
 
 # Settings for port ttyI7
 
--- isdn4k-utils/vbox/examples/vboxd.conf.example.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/vbox/examples/vboxd.conf.example	2013-11-23 12:52:33.205432705 +0100
@@ -5,7 +5,7 @@
 # login (server startup) time. If access is 'yes' the host can login
 # and count messages without special access.
 
-L:localhost:Y
+#L:localhost:Y
 L:*:N
 
 # Full access list
@@ -15,7 +15,7 @@
 
 # One user in this file can be configured by the `debconf' system, the next one.
 # Remove this comment if you don't want any configuration to happen.
-A:localhost:RW:username:*invalid*password*:/var/spool/vbox/ttyI6:incoming
+# A:localhost:RW:username:*invalid*password*:/var/spool/vbox/ttyI6:incoming
 # A:localhost:RW:nicole:xxx:/var/spool/vbox/nicole:incoming
 
 A:*:!:!:!:!:!
--- isdn4k-utils/ipppstats/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/ipppstats/Makefile.in	2013-11-23 12:47:59.062117731 +0100
@@ -6,14 +6,14 @@
 MANDIR       = @CONFIG_MANDIR@
 CC           = @CC@
 INSTALL      = @INSTALL@
-INSTALL_SBIN = $(INSTALL) -m 755 -o 0 -g 0
-INSTALL_DATA = $(INSTALL) -m 644 -o 0 -g 0
-INSTALL_DIR  = $(INSTALL) -m 755 -o 0 -g 0 -d
+INSTALL_SBIN = $(INSTALL) -m 755
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_DIR  = $(INSTALL) -m 755 -d
 
 PPPSTATSRCS  = ipppstats.c
 PPPSTATOBJS  = ipppstats.o
 
-CFLAGS       = -fomit-frame-pointer -O2
+CFLAGS       = $(RPM_OPT_FLAGS) -I@CONFIG_KERNELDIR@/include
 
 all: ipppstats
 
--- isdn4k-utils/lib/Makefile.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/lib/Makefile	2013-11-23 12:47:59.065117655 +0100
@@ -28,7 +28,7 @@
 # USER CONFIGURATION AREA
 ######################################################################
 
-CFLAGS      = -g -Wall -pipe #-O6
+CFLAGS      = $(RPM_OPT_FLAGS)
 DEFS        =
 ifndef _CC
 export _CC  = gcc
--- isdn4k-utils/lib/Makefile.in.redhat	2013-11-23 12:23:42.000000000 +0100
+++ isdn4k-utils/lib/Makefile.in	2013-11-23 12:47:59.063117706 +0100
@@ -11,7 +11,7 @@
 	# Install as root with numeric Id's, since these are the
 	# only ones that _really_ exist on _every_ system.
 	#
-	INSTALLOPTS += INSTALL= install -o 0 -g 0 -m 644
+	INSTALLOPTS += INSTALL= install -m 644
 endif
 
 all: .depend