diff --git a/.cvsignore b/.cvsignore
index c4b8f01..39098f5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -26,3 +26,4 @@ ent
 tags
 entities.h
 havepread.h
+libowfat
diff --git a/GNUmakefile b/GNUmakefile
index 95691c6..83b8b65 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -13,7 +13,7 @@ LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \
 buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a \
 textcode.a cdb.a critbit.a
 
-all: ent $(LIBS) libowfat.a libsocket t
+all: headers ent $(LIBS) libowfat.a libsocket t
 
 CROSS=
 #CROSS=i686-mingw-
@@ -204,9 +204,18 @@ openreadclose.h readclose.h ndelay.h array.h io.h safemult.h iob.h havealloca.h
 errmsg.h cdb.h cdb_make.h rangecheck.h iarray.h va_narg.h isset.h \
 compiletimeassert.h critbit.h
 
+libowfat:
+	-mkdir libowfat
+
+.PHONY: headers
+headers: libowfat $(patsubst %.h,libowfat/%.h,$(INCLUDES))
+
+libowfat/%.h: %.h
+	ln -f $< $@
+
 install-inc:
-	install -d $(DESTDIR)$(INCLUDEDIR)
-	install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)
+	install -d $(DESTDIR)$(INCLUDEDIR)/libowfat
+	install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)/libowfat
 
 install-lib: libowfat.a
 	install -d $(DESTDIR)$(LIBDIR)
@@ -220,6 +229,8 @@ install: install-inc install-man install-lib
 
 uninstall:
 	rm -f $(patsubst %.h,$(INCLUDEDIR)/%.h,$(INCLUDES))
+	rm -f $(INCLUDEDIR)/libowfat/*.h
+	rmdir -f $(INCLUDEDIR)/libowfat
 	rm -f $(patsubst %.3,$(MAN3DIR)/%.3,$(notdir $(wildcard */*.3)))
 	rm -f $(LIBDIR)/libowfat.a
 
diff --git a/Makefile b/Makefile
index 7b4f780..3dae97f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \
 buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a \
 textcode.a cdb.a critbit.a
 
-all: ent $(LIBS) libowfat.a libsocket t
+all: headers ent $(LIBS) libowfat.a libsocket t
 
 CROSS=
 #CROSS=i686-mingw-
@@ -791,9 +791,18 @@ openreadclose.h readclose.h ndelay.h array.h io.h safemult.h iob.h havealloca.h
 errmsg.h cdb.h cdb_make.h rangecheck.h iarray.h va_narg.h isset.h \
 compiletimeassert.h critbit.h
 
+libowfat:
+	-mkdir libowfat
+
+.PHONY: headers
+headers: libowfat $(patsubst %.h,libowfat/%.h,$(INCLUDES))
+
+libowfat/%.h: %.h
+	ln -f $< $@
+
 install-inc:
-	install -d $(DESTDIR)$(INCLUDEDIR)
-	install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)
+	install -d $(DESTDIR)$(INCLUDEDIR)/libowfat
+	install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)/libowfat
 
 install-lib: libowfat.a
 	install -d $(DESTDIR)$(LIBDIR)
@@ -807,10 +816,12 @@ install: install-inc install-man install-lib
 
 uninstall:
 	rm -f $(patsubst %.h,$(INCLUDEDIR)/%.h,$(INCLUDES))
+	rm -f $(INCLUDEDIR)/libowfat/*.h
+	rmdir -f $(INCLUDEDIR)/libowfat
 	rm -f $(patsubst %.3,$(MAN3DIR)/%.3,$(notdir $(wildcard */*.3)))
 	rm -f $(LIBDIR)/libowfat.a
 
-VERSION=libowfat-0.31
+VERSION=libowfat-0.32
 CURNAME=libowfat-0.31
 
 tar: clean rename