diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 331183f450..5d53515381 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -54,7 +54,6 @@ OBJS-$(CONFIG_FLAC_DECODER)            += x86/flacdsp_init.o
 OBJS-$(CONFIG_FLAC_ENCODER)            += x86/flacencdsp_init.o
 OBJS-$(CONFIG_OPUS_DECODER)            += x86/opusdsp_init.o
 OBJS-$(CONFIG_OPUS_ENCODER)            += x86/celt_pvq_init.o
-OBJS-$(CONFIG_HEVC_DECODER)            += x86/hevcdsp_init.o x86/h26x/h2656dsp.o
 OBJS-$(CONFIG_JPEG2000_DECODER)        += x86/jpeg2000dsp_init.o
 OBJS-$(CONFIG_LSCR_DECODER)            += x86/pngdsp_init.o
 OBJS-$(CONFIG_MLP_DECODER)             += x86/mlpdsp_init.o
@@ -162,13 +161,6 @@ X86ASM-OBJS-$(CONFIG_FLAC_DECODER)     += x86/flacdsp.o
 ifdef CONFIG_GPL
 X86ASM-OBJS-$(CONFIG_FLAC_ENCODER)     += x86/flac_dsp_gpl.o
 endif
-X86ASM-OBJS-$(CONFIG_HEVC_DECODER)     += x86/hevc_add_res.o            \
-                                          x86/hevc_deblock.o            \
-                                          x86/hevc_idct.o               \
-                                          x86/hevc_mc.o                 \
-                                          x86/h26x/h2656_inter.o        \
-                                          x86/hevc_sao.o                \
-                                          x86/hevc_sao_10bit.o
 X86ASM-OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp.o
 X86ASM-OBJS-$(CONFIG_LSCR_DECODER)     += x86/pngdsp.o
 X86ASM-OBJS-$(CONFIG_MLP_DECODER)      += x86/mlpdsp.o
diff --git a/libavcodec/x86/hevc/Makefile b/libavcodec/x86/hevc/Makefile
new file mode 100644
index 0000000000..8f1c88c569
--- /dev/null
+++ b/libavcodec/x86/hevc/Makefile
@@ -0,0 +1,12 @@
+clean::
+	$(RM) $(CLEANSUFFIXES:%=libavcodec/x86/hevc/%) $(CLEANSUFFIXES:%=libavcodec/x86/h26x/%)
+
+OBJS-$(CONFIG_HEVC_DECODER)             += x86/hevc/dsp_init.o      \
+                                           x86/h26x/h2656dsp.o
+X86ASM-OBJS-$(CONFIG_HEVC_DECODER)      += x86/hevc/add_res.o       \
+                                           x86/hevc/deblock.o       \
+                                           x86/hevc/idct.o          \
+                                           x86/hevc/mc.o            \
+                                           x86/hevc/sao.o           \
+                                           x86/hevc/sao_10bit.o     \
+                                           x86/h26x/h2656_inter.o
diff --git a/libavcodec/x86/hevc_add_res.asm b/libavcodec/x86/hevc/add_res.asm
similarity index 100%
rename from libavcodec/x86/hevc_add_res.asm
rename to libavcodec/x86/hevc/add_res.asm
diff --git a/libavcodec/x86/hevc_deblock.asm b/libavcodec/x86/hevc/deblock.asm
similarity index 100%
rename from libavcodec/x86/hevc_deblock.asm
rename to libavcodec/x86/hevc/deblock.asm
diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevc/dsp_init.c
similarity index 100%
rename from libavcodec/x86/hevcdsp_init.c
rename to libavcodec/x86/hevc/dsp_init.c
diff --git a/libavcodec/x86/hevc_idct.asm b/libavcodec/x86/hevc/idct.asm
similarity index 100%
rename from libavcodec/x86/hevc_idct.asm
rename to libavcodec/x86/hevc/idct.asm
diff --git a/libavcodec/x86/hevc_mc.asm b/libavcodec/x86/hevc/mc.asm
similarity index 100%
rename from libavcodec/x86/hevc_mc.asm
rename to libavcodec/x86/hevc/mc.asm
diff --git a/libavcodec/x86/hevc_sao.asm b/libavcodec/x86/hevc/sao.asm
similarity index 100%
rename from libavcodec/x86/hevc_sao.asm
rename to libavcodec/x86/hevc/sao.asm
diff --git a/libavcodec/x86/hevc_sao_10bit.asm b/libavcodec/x86/hevc/sao_10bit.asm
similarity index 100%
rename from libavcodec/x86/hevc_sao_10bit.asm
rename to libavcodec/x86/hevc/sao_10bit.asm