Index: libfo-0.6.pc.in
--- libfo-0.6.pc.in.orig	2007-07-18 12:51:18 +0200
+++ libfo-0.6.pc.in	2008-02-04 19:42:31 +0100
@@ -1,11 +1,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-pkgincludedir=@includedir@/libfo-@LT_RELEASE@
+pkgincludedir=@includedir@/libfo
 
 enable_cairo=@ENABLE_CAIRO@
 enable_gp=@ENABLE_GP@
-compat_stylesheet=@prefix@/share/xml/libfo-@VERSION@/libfo-compat.xsl
+compat_stylesheet=@prefix@/share/xml/libfo/libfo-compat.xsl
 
 Name: libfo
 Description: XSL formatter library for xmlroff
Index: libfo/Makefile.in
--- libfo/Makefile.in.orig	2008-01-13 21:03:00 +0100
+++ libfo/Makefile.in	2008-02-04 19:42:31 +0100
@@ -340,7 +340,7 @@
 	$(fodoc_headers)        \
 	$(libfo_headers)
 
-libfoincludedir = $(includedir)/libfo-0.6/libfo
+libfoincludedir = $(includedir)/libfo
 libfo_libfo_la_SOURCES = \
 	$(libfo_headers)	\
 	fo-font-desc.c		\
@@ -379,7 +379,7 @@
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined)
 
-libfo_0_6_includedir = $(includedir)/libfo-0.6/libfo
+libfo_0_6_includedir = $(includedir)/libfo
 libfo_0_6_include_HEADERS = \
 	fo-object.h		\
 	fo-node.h		\
Index: libfo/area/Makefile.in
--- libfo/area/Makefile.in.orig	2008-01-13 21:03:00 +0100
+++ libfo/area/Makefile.in	2008-02-04 19:42:31 +0100
@@ -255,7 +255,7 @@
 @STRIP_END@
 
 noinst_LTLIBRARIES = libfo-area.la
-libfo_area_includedir = $(includedir)/libfo-0.6/libfo/area
+libfo_area_includedir = $(includedir)/libfo/area
 libfo_area_include_HEADERS = \
 	fo-area.h
 
Index: libfo/datatype/Makefile.in
--- libfo/datatype/Makefile.in.orig	2008-01-13 21:03:01 +0100
+++ libfo/datatype/Makefile.in	2008-02-04 19:42:31 +0100
@@ -253,7 +253,7 @@
 @STRIP_END@
 
 noinst_LTLIBRARIES = libfo-datatype.la
-libfo_datatype_includedir = $(includedir)/libfo-0.6/libfo/datatype
+libfo_datatype_includedir = $(includedir)/libfo/datatype
 libfo_datatype_include_HEADERS = \
 	fo-datatype.h		\
 	fo-enum.h
Index: libfo/fo/Makefile.in
--- libfo/fo/Makefile.in.orig	2008-01-13 21:03:01 +0100
+++ libfo/fo/Makefile.in	2008-02-04 19:42:31 +0100
@@ -322,7 +322,7 @@
 	fo-wrapper-block-area.c \
 	fo-wrapper-block-area.h
 
-libfo_fo_includedir = $(includedir)/libfo-0.6/libfo/fo
+libfo_fo_includedir = $(includedir)/libfo/fo
 libfo_fo_include_HEADERS = \
 	fo-fo.h
 
Index: libfo/property/Makefile.in
--- libfo/property/Makefile.in.orig	2008-01-13 21:03:01 +0100
+++ libfo/property/Makefile.in	2008-02-04 19:42:31 +0100
@@ -391,7 +391,7 @@
 # libfo-text-property.la is a convenience library containing
 # properties that depend on Pango.
 noinst_LTLIBRARIES = libfo-property.la libfo-text-property.la
-libfo_property_includedir = $(includedir)/libfo-0.6/libfo/property
+libfo_property_includedir = $(includedir)/libfo/property
 libfo_property_include_HEADERS = \
 	fo-property.h
 
Index: libfo/util/Makefile.in
--- libfo/util/Makefile.in.orig	2008-01-13 21:03:01 +0100
+++ libfo/util/Makefile.in	2008-02-04 19:42:31 +0100
@@ -252,7 +252,7 @@
 @STRIP_END@
 
 noinst_LTLIBRARIES = libfo-util.la
-libfo_util_includedir = $(includedir)/libfo-0.6/libfo/util
+libfo_util_includedir = $(includedir)/libfo/util
 libfo_util_include_HEADERS = \
 	fo-hash-table.h		\
 	fo-image.h		\