diff --git a/Makefile.module b/Makefile.module
index aaf7a29..cebdffd 100644
--- a/Makefile.module
+++ b/Makefile.module
@@ -22,11 +22,11 @@ arch: $(KDIR)/arch
 
 clean:
 	rm -f $(TARGETS) $(TARGETDIR)/.*.flags $(TARGETDIR)/*.o
-	rm -f $(TARGETDIR)/*~ *~
+	rm -f $(TARGETDIR)/*~ include/linux/*~ *~ .kversion
 	
 $(TARGET):
-	$(MAKE) -f Makefile KDIR=$(KDIR) $(TARGET)
+	$(MAKE) -f Makefile KDIR=$(KDIR) TARGETDIR=$(TARGETDIR) $(TARGET)
 
 install: $(TARGETS)
-	$(MAKE) -f Makefile KDIR=$(KDIR) install_mod
+	$(MAKE) -f Makefile KDIR=$(KDIR) TARGETDIR=$(TARGETDIR) install_mod
 
diff --git a/Makefile.standalone b/Makefile.standalone
index 6bf9e0b..bc0dd97 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -1,12 +1,12 @@
-# ipppcomp slave Makefile
-# (c) 03/2001 Karsten Keil <kkeil@suse.de>
-# adapted from Kurt Garloffs <garloff@suse.de> SecuMod package
+# km_newhisax slave Makefile
+# (c) 10/2001 Karsten Keil <kkeil@suse.de>
+#
 KDIR = /usr/src/linux
 
 DESTDIR =
-TARGET = newhisax
+TARGET = 
 TARGETS := Rules.make arch $(TARGET)
-TARGETMODDIR = misc
+TARGETMODDIR = "../misc"
 
 default: $(TARGETS)
 
@@ -35,15 +35,14 @@ endif
 
 MODLIB := $(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
 
-newhisax: drivers/isdn/hisax
-	$(MAKE) -C drivers/isdn/hisax CFLAGS="$(CFLAGS) $(MODFLAGS)" MAKING_MODULES=1 modules
+newhisax: $(TARGETDIR)
+	$(MAKE) -C $(TARGETDIR) CFLAGS="$(CFLAGS) $(MODFLAGS)" MAKING_MODULES=1 modules
 
 install: install_mod
 
-install_mod: $(MODLIB)/$(TARGETMODDIR)/$(TARGET)
+install_mod: $(MODLIB)/$(TARGETMODDIR)
+	$(MAKE) -C $(TARGETDIR) MOD_DESTDIR=$(TARGETMODDIR) modules_install
 
-$(MODLIB)/$(TARGETMODDIR)/$(TARGET): $(TARGET)
-	echo "Install $(TARGET)"; install -o root -g root -d $(MODLIB)/$(TARGETMODDIR); \
-	install -o root -g root -m 0644 $(TARGET) $(MODLIB)/$(TARGETMODDIR)/; \
-	#echo "depmod -a $(KERNELRELEASE)"; depmod -a $(KERNELRELEASE); \
+$(MODLIB)/$(TARGETMODDIR):
+	mkdir -p $(MODLIB)/$(TARGETMODDIR) 
 
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h
index 74c4530..e7d24d5 100644
--- a/include/linux/mISDNif.h
+++ b/include/linux/mISDNif.h
@@ -8,7 +8,6 @@
 #include <stdarg.h>
 #include <linux/types.h>
 #include <linux/errno.h>
-#include <linux/isdn_compat.h>
 
 /* primitives for information exchange
  * generell format
@@ -549,6 +548,7 @@ typedef struct _FACILITY {
 
 
 #ifdef __KERNEL__
+#include <linux/isdn_compat.h>
 #include <linux/skbuff.h>
 
 typedef struct _hisax_head {