diff --git a/CHANGES b/CHANGES
index 23599c7..5028ef7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,7 @@
 * Intersil Corporation as part of PRISM(R) chipset product development.
 *
 * --------------------------------------------------------------------
+ - More makefile fixes from Pavel Roskin
 -pre18a
  - brown-paper-bag fix for the 2.4 build.  And it no longer builds on 
    2.2 thanks to an accidental makefile commit.
diff --git a/src/p80211/Makefile b/src/p80211/Makefile
index afeb5c8..453e5b7 100644
--- a/src/p80211/Makefile
+++ b/src/p80211/Makefile
@@ -102,7 +102,7 @@ clean:
 install:
 	mkdir -p $(TARGET_MODDIR)/kernel/drivers/net
 ifeq ($(KERN_25), y)
-	cp p802111.ko	$(TARGET_MODDIR)/kernel/drivers/net
+	cp p80211.ko	$(TARGET_MODDIR)/kernel/drivers/net
 else
 	cp p80211.o	$(TARGET_MODDIR)/kernel/drivers/net
 endif
diff --git a/src/prism2/driver/Makefile b/src/prism2/driver/Makefile
index 7f6578b..7190eff 100644
--- a/src/prism2/driver/Makefile
+++ b/src/prism2/driver/Makefile
@@ -48,10 +48,6 @@ ifeq ($(WLAN_DEBUG), y)
 WLAN_INCLUDE_DEBUG=-DWLAN_INCLUDE_DEBUG
 endif
 
-ifneq ($(KERNELRELEASE),)
-
-EXTRA_CFLAGS += -I$(WLAN_SRC)/../../include -I$(WLAN_SRC)/../include $(WLAN_INCLUDE_DEBUG)
-
 obj-m :=
 
 ifeq ($(PRISM2_PCMCIA), y)
@@ -70,6 +66,10 @@ ifeq ($(PRISM2_USB), y)
 	obj-m += prism2_usb.o
 endif
 
+ifneq ($(KERNELRELEASE),)
+
+EXTRA_CFLAGS += -I$(WLAN_SRC)/../../include -I$(WLAN_SRC)/../include $(WLAN_INCLUDE_DEBUG)
+
 ifeq ($(KERN_25), y)
 
 else
@@ -104,7 +104,7 @@ clean:
 
 install:
 ifeq ($(KERN_25), y)
-	cp *.ko	$(TARGET_MODDIR)/kernel/drivers/net
+	cp $(obj-m:.o=.ko)	$(TARGET_MODDIR)/kernel/drivers/net
 else
 	cp $(obj-m)	$(TARGET_MODDIR)/kernel/drivers/net
 endif