diff --git a/Makefile.in b/Makefile.in
index 95da87e5cd..aa47071f83 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25145,6 +25145,11 @@ INTL_DIST:
 	cp $(INTLDIR)/Makefile $(DISTDIR)/locale
 	cp $(INTLDIR)/*.po $(DISTDIR)/locale
 	-cp $(INTLDIR)/*.mo $(DISTDIR)/locale
+	subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \
+	for dir in "$$subdirs"; do                                   \
+	    mkdir $(DISTDIR)/locale/$$dir;                           \
+	    cp $(INTLDIR)/$$dir/*.[pm]o $(DISTDIR)/locale/$$dir;     \
+	done
 
 MANUAL_DIST:
 	mkdir $(DISTDIR)/docs
diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index c9d2a20964..b269cdbeac 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -1025,6 +1025,11 @@ INTL_DIST:
 	cp $(INTLDIR)/Makefile $(DISTDIR)/locale
 	cp $(INTLDIR)/*.po $(DISTDIR)/locale
 	-cp $(INTLDIR)/*.mo $(DISTDIR)/locale
+	subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \
+	for dir in "$$subdirs"; do                                   \
+	    mkdir $(DISTDIR)/locale/$$dir;                           \
+	    cp $(INTLDIR)/$$dir/*.[pm]o $(DISTDIR)/locale/$$dir;     \
+	done
 
 MANUAL_DIST:
 	mkdir $(DISTDIR)/docs