diff --git a/Makefile.am b/Makefile.am
index 20f03826a..bbd135284 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -28,7 +28,8 @@ SUBDIRS = lib meta libguile guile-readline emacs \
 	  srfi examples test-suite benchmark-suite am \
 	  module doc testsuite
 
-include_HEADERS = libguile.h
+libguileincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)
+libguileinclude_HEADERS = libguile.h
 
 EXTRA_DIST = LICENSE HACKING GUILE-VERSION		\
 	     m4/ChangeLog-2008 \
diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am
index 24a3fd44d..8d22b246a 100644
--- a/guile-readline/Makefile.am
+++ b/guile-readline/Makefile.am
@@ -54,7 +54,8 @@ libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS =	\
 
 BUILT_SOURCES = readline.x
 
-pkginclude_HEADERS = readline.h
+modincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)
+modinclude_HEADERS = readline.h
 
 snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
 SUFFIXES = .x
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 2dc68ae22..59a364738 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -462,7 +462,7 @@ endif HAVE_LD_VERSION_SCRIPT
 pkginclude_HEADERS = 
 
 # These are headers visible as <libguile/mumble.h>.
-modincludedir = $(includedir)/libguile
+modincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)/libguile
 modinclude_HEADERS =				\
 	__scm.h					\
 	alist.h					\
diff --git a/meta/guile-2.0.pc.in b/meta/guile-2.0.pc.in
index 1da677312..c83d8217e 100644
--- a/meta/guile-2.0.pc.in
+++ b/meta/guile-2.0.pc.in
@@ -5,6 +5,7 @@ includedir=@includedir@
 datarootdir=@datarootdir@
 datadir=@datadir@
 pkgdatadir=@datadir@/guile
+pkgincludedir=@includedir@/guile
 
 sitedir=@sitedir@
 extensionsdir=@libdir@/guile/@GUILE_EFFECTIVE_VERSION@/extensions
@@ -14,4 +15,4 @@ Name: GNU Guile
 Description: GNU's Ubiquitous Intelligent Language for Extension
 Version: @GUILE_VERSION@
 Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ @GUILE_LIBS@
-Cflags: -I${includedir} @GUILE_CFLAGS@ @BDW_GC_CFLAGS@
+Cflags: -I${pkgincludedir}/@GUILE_EFFECTIVE_VERSION@ @GUILE_CFLAGS@ @BDW_GC_CFLAGS@
diff --git a/srfi/Makefile.am b/srfi/Makefile.am
index 1ecd94111..bb91268e7 100644
--- a/srfi/Makefile.am
+++ b/srfi/Makefile.am
@@ -32,7 +32,8 @@ AM_CPPFLAGS = -I.. -I$(srcdir)/..				\
 AM_CFLAGS = $(GCC_CFLAGS)
 AM_LDFLAGS = $(GNU_LD_FLAGS)
 
-srfiincludedir = $(pkgincludedir)/srfi
+# FIXME: should be libguile/srfi
+srfiincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)/srfi
 
 # These headers are visible as <guile/srfi/mumble.h>
 srfiinclude_HEADERS = srfi-1.h srfi-4.h srfi-13.h srfi-14.h srfi-60.h