diff --git a/enlightenment-config.in b/enlightenment-config.in
index b170eddc3..645de6153 100644
--- a/enlightenment-config.in
+++ b/enlightenment-config.in
@@ -39,9 +39,7 @@ while test $# -gt 0; do
       echo @VERSION@
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        includes=-I@includedir@
-      fi
+      includes=-I@includedir@/enlightenment
       echo $includes
       ;;
     --libs)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 0a97e9abe..3b803a0d8 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -8,61 +8,64 @@ INCLUDES = -I$(includedir) \
 
 bin_PROGRAMS = enlightenment enlightenment_remote enlightenment_eapp
 
-enlightenment_SOURCES = \
+ENLIGHTENMENTHEADERS = \
 e.h \
 e_file.h \
+e_user.h \
+e_manager.h \
+e_path.h \
+e_init.h \
+e_ipc.h \
+e_error.h \
+e_container.h \
+e_desk.h \
+e_border.h \
+e_pointer.h \
+e_config.h \
+e_menu.h \
+e_object.h \
+e_icon.h \
+e_box.h \
+e_int_menus.h \
+e_module.h \
+e_apps.h \
+e_atoms.h \
+e_utils.h \
+e_canvas.h \
+e_focus.h \
+e_place.h \
+e_resist.h \
+e_startup.h
+
+enlightenment_SOURCES = \
 e_file.c \
 e_main.c \
-e_user.h \
 e_user.c \
-e_manager.h \
 e_manager.c \
-e_path.h \
 e_path.c \
-e_init.h \
 e_init.c \
-e_ipc.h \
 e_ipc.c \
-e_error.h \
 e_error.c \
-e_container.h \
 e_container.c \
-e_desk.h \
 e_desk.c \
-e_border.h \
 e_border.c \
-e_pointer.h \
 e_pointer.c \
-e_config.h \
 e_config.c \
-e_menu.h \
 e_menu.c \
-e_object.h \
 e_object.c \
-e_icon.h \
 e_icon.c \
-e_box.h \
 e_box.c \
-e_int_menus.h \
 e_int_menus.c \
-e_module.h \
 e_module.c \
-e_apps.h \
 e_apps.c \
-e_atoms.h \
 e_atoms.c \
-e_utils.h \
 e_utils.c \
-e_canvas.h \
 e_canvas.c \
-e_focus.h \
 e_focus.c \
-e_place.h \
 e_place.c \
-e_resist.h \
 e_resist.c \
-e_startup.h \
-e_startup.c
+e_startup.c \
+$(ENLIGHTENMENTHEADERS)
 
 enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@
 
@@ -77,3 +80,6 @@ e.h \
 e_eapp_main.c
 
 enlightenment_eapp_LDFLAGS = @e_libs@ @dlopen_libs@
+
+installed_headersdir = $(prefix)/include/enlightenment
+installed_headers_DATA = $(ENLIGHTENMENTHEADERS)