diff --git a/Makefile.in b/Makefile.in
index ab066e4..c6e5d5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,6 +2,7 @@ PACKAGE 		= @package@
 NICKNAME 		= @nickname@
 PROJECT_DIR 		= @project_dir@
 GIT_REFERENCE_DIR	= @git_reference_dir@
+CUSTOM_INSTALL_HEADERS  = @custom_install_headers@
 
 BUILD 			= @build@
 HOST 			= @host@
@@ -124,7 +125,7 @@ app.tag:
 install-libs:	package-install-shared
 install-libs:	package-install-static
 
-install-headers:package-shared package-static
+install-headers-default:
 		mkdir -p $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)
 		cp $(API_HEADERS) $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)
 
diff --git a/config.project b/config.project
index 68bd13f..8720dac 100644
--- a/config.project
+++ b/config.project
@@ -1,6 +1,7 @@
 # project
 mb_package=mdso
 mb_require_out_of_tree=no
+mb_custom_install_headers=no
 
 
 # build
diff --git a/configure b/configure
index 8a17f2e..e4f31a8 100755
--- a/configure
+++ b/configure
@@ -354,6 +354,7 @@ config_copy()
 			-e 's^@nickname@^'"$mb_nickname"'^g'				\
 			-e 's^@project_dir@^'"$mb_project_dir"'^g'			\
 			-e 's^@git_reference_dir@^'"$mb_git_reference_dir"'^g'		\
+			-e 's^@custom_install_headers@^'"$mb_custom_install_headers"'^g' \
 											\
 			-e 's^@build@^'"$mb_build"'^g'					\
 			-e 's^@host@^'"$mb_host"'^g'					\
diff --git a/project/custom.mk b/project/custom.mk
index 3845121..8f9fabb 100644
--- a/project/custom.mk
+++ b/project/custom.mk
@@ -50,3 +50,15 @@ app-tag:	PACKAGE_APP = $(DEFAULT_APP)
 app.tag:	$(DEFAULT_APP)
 
 endif
+
+
+
+ifeq ($(CUSTOM_INSTALL_HEADERS),yes)
+
+install-headers:install-headers-custom
+
+else
+
+install-headers:install-headers-default
+
+endif