diff --git a/configure.ac b/configure.ac

index 30bddd95de6..705c2d16eb2 100644

--- a/configure.ac

+++ b/configure.ac

@@ -5283,6 +5283,13 @@ else

 fi

 AC_SUBST(docs_dir)

+# Monodoc

+#

+monodocdir=${prefix}/lib/monodoc

+monodocsourcesdir=${datadir}/monodoc

+AC_SUBST(monodocdir)

+AC_SUBST(monodocsourcesdir)

+

 ## Maybe should also disable if mcsdir is invalid.  Let's punt the issue for now.

 AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_build != xno])

 AM_CONDITIONAL(BUILD_SUPPORT, [test x$enable_support_build != xno])

diff --git a/data/monodoc.pc.in b/data/monodoc.pc.in

index 038bbeecdeb..bcf9dc8b68b 100644

--- a/data/monodoc.pc.in

+++ b/data/monodoc.pc.in

@@ -1,7 +1,7 @@

 prefix=@prefix@

 exec_prefix=@exec_prefix@

 libdir=@prefix@/lib

-sourcesdir=${libdir}/monodoc/sources

+sourcesdir=@monodocsourcesdir@/sources

 Name: Monodoc

 Description: Monodoc - Mono Documentation Tools

diff --git a/docs/Makefile.am b/docs/Makefile.am

index 95519541ea3..401ba4b9832 100644

--- a/docs/Makefile.am

+++ b/docs/Makefile.am

@@ -1,4 +1,4 @@

-sourcesdir = $(prefix)/lib/monodoc/sources

+sourcesdir = $(monodocsourcesdir)/sources

 sources_DATA = \

 	mono-file-formats.source \

diff --git a/mcs/build/config-default.make b/mcs/build/config-default.make

index 0c05bd4c050..28fda988dee 100644

--- a/mcs/build/config-default.make

+++ b/mcs/build/config-default.make

@@ -30,6 +30,8 @@ prefix = /usr/local

 exec_prefix = $(prefix)

 mono_libdir = $(exec_prefix)/lib

 sysconfdir = $(prefix)/etc

+datadir = $(prefix)/share

+monodocsourcesdir = $(datadir)/monodoc

 #RUNTIME = mono

 RUNTIME = false

 MONO_PATH_TOP = $(topdir)/class/lib/$(PROFILE_DIRECTORY)

diff --git a/mcs/class/monodoc/Makefile b/mcs/class/monodoc/Makefile

index 90ce49077ec..4107eab570b 100644

--- a/mcs/class/monodoc/Makefile

+++ b/mcs/class/monodoc/Makefile

@@ -98,5 +98,5 @@ include ../../build/library.make

 all-local: $(the_lib).config

 $(the_lib).config: monodoc.dll.config.in

-	sed 's,@monodoc_refdir@,$(mono_libdir)/monodoc,g' monodoc.dll.config.in > $@

+	sed 's,@monodoc_refdir@,$(monodocsourcesdir),g' monodoc.dll.config.in > $@

diff --git a/mcs/docs/Makefile b/mcs/docs/Makefile

index 88bddb66268..a8a65f46b56 100644

--- a/mcs/docs/Makefile

+++ b/mcs/docs/Makefile

@@ -46,7 +46,7 @@ clean-local:

 dist-local: dist-default

-MONODOC_INSTALL_DIR = $(DESTDIR)$(mono_libdir)/monodoc

+MONODOC_INSTALL_DIR = $(DESTDIR)$(monodocsourcesdir)

 ifdef DISABLE_MCS_DOCS

 all-local: