diff --git a/legacy/evas/Makefile.am b/legacy/evas/Makefile.am
index 1c256b3895..e673241f75 100644
--- a/legacy/evas/Makefile.am
+++ b/legacy/evas/Makefile.am
@@ -1,32 +1,17 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src proj
+SUBDIRS = data src proj
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \
 		       ltconfig ltmain.sh missing mkinstalldirs \
 		       stamp-h.in evas_docs.tar evas_docs.tar.gz evas.c
 
-install-data-local:
-	@$(NORMAL_INSTALL)
-	if test -d $(srcdir)/data; then \
-	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \
-	  for d in $(srcdir)/data/*; do \
-	      cp -pR $$d $(DESTDIR)$(pkgdatadir)/data; \
-	  done \
-	fi
-
 dist-hook:
 	./gendoc; \
 	tar cvf evas_docs.tar doc/html doc/latex doc/man; \
 	rm -f evas_docs.tar.gz; \
-	gzip -9 evas_docs.tar; \
-	if test -d data; then \
-	  mkdir $(distdir)/data; \
-	  for d in data/*; do \
-	      cp -pR $$d $(distdir)/data; \
-	  done \
-	fi
+	gzip -9 evas_docs.tar;
 
 bin_SCRIPTS = evas-config
 
diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index f5c9501e9c..ce029973b4 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -1437,6 +1437,7 @@ AC_SUBST(altivec_cflags)
 
 AC_OUTPUT([
 Makefile
+data/Makefile
 src/Makefile
 src/bin/Makefile
 src/bin/evas_software_win32/Makefile
diff --git a/legacy/evas/data/.cvsignore b/legacy/evas/data/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/legacy/evas/data/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/legacy/evas/data/Makefile.am b/legacy/evas/data/Makefile.am
new file mode 100644
index 0000000000..049dfaeb72
--- /dev/null
+++ b/legacy/evas/data/Makefile.am
@@ -0,0 +1,9 @@
+FILES = arial.ttf grunge.ttf morpheus.ttf notepad.ttf \
+        backdrop.png bg.png e_logo.png evas_logo.png panel.png \
+        panel_shadow.png panel_top.png sphere.png sphere_shadow.png \
+        t1.png t2.png test_pattern.png
+
+miscdir = $(pkgdatadir)/data
+misc_DATA = $(FILES)
+
+EXTRA_DIST = $(FILES)