diff -Naur iptables-1.4.0/libipq/Makefile iptables-1.4.0-magellan/libipq/Makefile
--- iptables-1.4.0/libipq/Makefile	2007-01-23 13:49:50.000000000 +0100
+++ iptables-1.4.0-magellan/libipq/Makefile	2008-03-27 11:58:36.000000000 +0100
@@ -17,7 +17,7 @@
 
 DEVEL_LIBS+=libipq/libipq.a
 
-DEVEL_HEADERS+=include/libipq/libipq.h
+DEVEL_HEADERS+=include/libipq/libipq.h include/libipq/ip_queue_64.h
 
 ifndef TOPLEVEL_INCLUDED
 local:
diff -Naur iptables-1.4.0/libiptc/Makefile iptables-1.4.0-magellan/libiptc/Makefile
--- iptables-1.4.0/libiptc/Makefile	2007-01-23 13:49:53.000000000 +0100
+++ iptables-1.4.0-magellan/libiptc/Makefile	2008-03-27 12:00:36.000000000 +0100
@@ -17,8 +17,11 @@
 ifeq ($(DO_IPV6), 1)
 EXTRA_DEPENDS+= libiptc/libip6tc.d
 libiptc/libiptc.a: libiptc/libiptc.a(libiptc/libip6tc.o)
+DEVEL_HEADERS+=include/libiptc/libip6tc.h
 endif
 
+DEVEL_HEADERS+=include/libiptc/libiptc.h include/libiptc/ipt_kernel_headers.h
+
 libiptc/libip4tc.d libiptc/libip6tc.d: %.d: %.c
 	@-$(CC) -M -MG $(CFLAGS) $< | sed -e 's@^.*\.o:@$*.d libiptc/libiptc.a($*.o):@' > $@
 endif
diff -Naur iptables-1.4.0/Makefile iptables-1.4.0-magellan/Makefile
--- iptables-1.4.0/Makefile	2007-12-22 13:44:46.000000000 +0100
+++ iptables-1.4.0-magellan/Makefile	2008-03-27 11:58:00.000000000 +0100
@@ -49,8 +49,10 @@
 CFLAGS += -DNO_SHARED_LIBS=1
 endif
 
-EXTRAS+=iptables iptables.o iptables.8
+EXTRAS+=iptables iptables.o iptables.8 libiptables.a
 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(MANDIR)/man8/iptables.8
+DEVEL_HEADERS+=include/iptables.h include/iptables_common.h
+DEVEL_LIBS+=libiptables.a
 
 # No longer experimental.
 ifneq ($(DO_MULTI), 1)
@@ -59,7 +61,7 @@
 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore $(DESTDIR)$(BINDIR)/iptables-xml $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8
 
 ifeq ($(DO_IPV6), 1)
-EXTRAS+=ip6tables ip6tables.o ip6tables.8
+EXTRAS+=ip6tables ip6tables.o ip6tables.8 libip6tables.a
 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables $(DESTDIR)$(MANDIR)/man8/ip6tables.8
 
 ifneq ($(DO_MULTI), 1)
@@ -67,6 +69,8 @@
 endif
 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8
 endif
+DEVEL_HEADERS+=include/ip6tables.h
+DEVEL_LIBS+=libip6tables.a
 
 ifndef IPT_LIBDIR
 IPT_LIBDIR:=$(LIBDIR)/iptables
@@ -102,6 +106,8 @@
 print-extensions:
 	@[ -n "$(OPTIONALS)" ] && echo Extensions found: $(OPTIONALS)
 
+libiptables.a: libiptables.a(iptables.o)
+
 iptables.o: iptables.c
 	$(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
 
@@ -156,6 +162,8 @@
 	cp $< $@
 endif
 
+libip6tables.a: libip6tables.a(ip6tables.o)
+
 ip6tables.o: ip6tables.c
 	$(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
 
@@ -221,7 +229,7 @@
 .PHONY: install-devel-headers
 install-devel-headers: $(DEVEL_HEADERS)
 	@[ -d $(DESTDIR)$(INCDIR) ] || mkdir -p $(DESTDIR)$(INCDIR)
-	@cp -v $(DEVEL_HEADERS) $(DESTDIR)$(INCDIR)
+	@cp -v --parents $(DEVEL_HEADERS) `echo $(DESTDIR)$(INCDIR) | sed  -e "s:/include/\?::"`
 
 .PHONY: install-devel-libs
 install-devel-libs: $(DEVEL_LIBS)