diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am
index e336782..eccf0aa 100644
--- a/data/desktop/Makefile.am
+++ b/data/desktop/Makefile.am
@@ -1,3 +1,4 @@
+AUTOMAKE_OPTIONS = subdir-objects
 MAINTAINERCLEANFILES = Makefile.in Makefile
 
 desktopdir = $(datadir)/applications
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index d044fcf..ad8d7b3 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -1,4 +1,7 @@
+AUTOMAKE_OPTIONS = subdir-objects
 MAINTAINERCLEANFILES = Makefile.in Makefile
 
+EXTRA_DIST = ephoto.png
+
 filesdir = $(datadir)/$(PACKAGE)/images
 files_DATA = ephoto.png
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 113caa2..1bc217e 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,3 +1,4 @@
+AUTOMAKE_OPTIONS = subdir-objects
 MAINTAINERCLEANFILES = Makefile.in Makefile
 
 EDJE_CC = @edje_cc@
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index f9bbdef..1bfdc8b 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,4 +1,6 @@
-MAINTAINERCLEANFILES = *.o config.h.in config.h Makefile.in Makefile stamp-h1
+AUTOMAKE_OPTIONS = subdir-objects
+MAINTAINERCLEANFILES = *.gcda *.gcno *.o config.h.in config.h Makefile.in Makefile stamp-h1
+DISTCLEANFILES = *.gcda *.gcno
 
 bin_PROGRAMS = ephoto