diff --git a/Makefile b/Makefile
index 01c2f0fc9d750fc9bff596d032e9e1eb40e1710c..319740af2293ec76753ddfd11ffc487729c7a8da 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
 
 SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
                ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
-               HOSTPROGS
+               HOSTPROGS BUILT_HEADERS
 
 define RESET
 $(1) :=
diff --git a/subdir.mak b/subdir.mak
index e0ac6810b66f467c2abf1e7fa7a3c41dddc94fd5..8bcf1342585fa7c0c38765ad1395ce7de90816bb 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -80,6 +80,9 @@ install-headers::
 	install -d "$(INCINSTDIR)"
 	install -d "$(LIBDIR)/pkgconfig"
 	install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
+ifdef BUILT_HEADERS
+	install -m 644 $(addprefix $(SUBDIR),$(BUILT_HEADERS)) "$(INCINSTDIR)"
+endif
 	install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
 endef