--- Makefile.am
+++ Makefile.am
@@ -57,6 +57,25 @@
 	NEWS \
 	README
 
+includeclhdir = $(prefix)/include/$(PACKAGE)/client/linux/handler
+includeclh_HEADERS = src/client/linux/handler/exception_handler.h
+
+includecdir = $(prefix)/include/$(PACKAGE)/common
+includec_HEADERS = \
+	src/google_breakpad/common/*.h \
+	src/common/*.h
+
+includeclmdir = $(prefix)/include/$(PACKAGE)/client/linux/minidump_writer
+includeclm_HEADERS = src/client/linux/minidump_writer/*.h
+
+includeclcdir = $(prefix)/include/$(PACKAGE)/client/linux/crash_generation
+includeclc_HEADERS = src/client/linux/crash_generation/*.h
+
+includepdir = $(prefix)/include/$(PACKAGE)/processor
+includep_HEADERS = src/processor/scoped_ptr.h
+
+includelssdir = $(prefix)/include/$(PACKAGE)/lss
+includelss_HEADERS = src/third_party/lss/linux_syscall_support.h
 
 ## Libraries
 noinst_LIBRARIES =
@@ -1005,3 +1024,6 @@
 	src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym \
 	src/tools/windows/symupload/symupload.cc \
 	src/tools/windows/symupload/symupload.vcproj
+
+install-data-hook:
+	patch -d $(DESTDIR)/$(prefix)/include/$(PACKAGE) -p0 < google-breakpad-headers-install.patch