diff --git a/data/Makefile.in b/data/Makefile.in
index 3e0e22fca..240953a22 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -257,7 +257,7 @@ desktop_in_files = gajim.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 soundsdir = $(pkgdatadir)/data/sounds
 sounds_DATA = $(srcdir)/sounds/*.wav
-otherdir = $(pkgdatadir)/data/others
+otherdir = $(pkgdatadir)/data/other
 other_DATA = other/servers.xml
 man_MANS = gajim.1 gajim-remote.1
 EXTRA_DIST = $(desktop_in_files) \
diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index 868898df9..6b35c8bbf 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -1,6 +1,13 @@
 pixmapsdir = $(pkgdatadir)/data/pixmaps
 pixmaps_DATA = $(srcdir)/*.png \
-			   gajim.ico \
-			   $(srcdir)/events/*.png \
-			   $(srcdir)/agents/*.png
-EXTRA_DIST = $(pixmaps_DATA)
+			   gajim.ico 
+
+eventsdir = $(pkgdatadir)/data/pixmaps/events
+events_DATA = $(srcdir)/events/*.png 
+
+agentsdir = $(pkgdatadir)/data/pixmaps/agents
+agents_DATA = $(srcdir)/agents/*.png
+
+EXTRA_DIST = $(pixmaps_DATA) \
+			 $(events_DATA)  \
+			 $(agents_DATA)  
diff --git a/data/pixmaps/Makefile.in b/data/pixmaps/Makefile.in
index 47a31c65d..b0ae9b8e2 100644
--- a/data/pixmaps/Makefile.in
+++ b/data/pixmaps/Makefile.in
@@ -55,9 +55,12 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pixmapsdir)"
+am__installdirs = "$(DESTDIR)$(agentsdir)" "$(DESTDIR)$(eventsdir)" \
+	"$(DESTDIR)$(pixmapsdir)"
+agentsDATA_INSTALL = $(INSTALL_DATA)
+eventsDATA_INSTALL = $(INSTALL_DATA)
 pixmapsDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pixmaps_DATA)
+DATA = $(agents_DATA) $(events_DATA) $(pixmaps_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -237,11 +240,16 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 pixmapsdir = $(pkgdatadir)/data/pixmaps
 pixmaps_DATA = $(srcdir)/*.png \
-			   gajim.ico \
-			   $(srcdir)/events/*.png \
-			   $(srcdir)/agents/*.png
+			   gajim.ico 
+
+eventsdir = $(pkgdatadir)/data/pixmaps/events
+events_DATA = $(srcdir)/events/*.png 
+agentsdir = $(pkgdatadir)/data/pixmaps/agents
+agents_DATA = $(srcdir)/agents/*.png
+EXTRA_DIST = $(pixmaps_DATA) \
+			 $(events_DATA)  \
+			 $(agents_DATA)  
 
-EXTRA_DIST = $(pixmaps_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -284,6 +292,40 @@ clean-libtool:
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
+install-agentsDATA: $(agents_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(agentsdir)" || $(mkdir_p) "$(DESTDIR)$(agentsdir)"
+	@list='$(agents_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(agentsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(agentsdir)/$$f'"; \
+	  $(agentsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(agentsdir)/$$f"; \
+	done
+
+uninstall-agentsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(agents_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(agentsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(agentsdir)/$$f"; \
+	done
+install-eventsDATA: $(events_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(eventsdir)" || $(mkdir_p) "$(DESTDIR)$(eventsdir)"
+	@list='$(events_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(eventsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(eventsdir)/$$f'"; \
+	  $(eventsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(eventsdir)/$$f"; \
+	done
+
+uninstall-eventsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(events_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(eventsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(eventsdir)/$$f"; \
+	done
 install-pixmapsDATA: $(pixmaps_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pixmapsdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapsdir)"
@@ -340,7 +382,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(pixmapsdir)"; do \
+	for dir in "$(DESTDIR)$(agentsdir)" "$(DESTDIR)$(eventsdir)" "$(DESTDIR)$(pixmapsdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -385,7 +427,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-pixmapsDATA
+install-data-am: install-agentsDATA install-eventsDATA \
+	install-pixmapsDATA
 
 install-exec-am:
 
@@ -411,17 +454,20 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-pixmapsDATA
+uninstall-am: uninstall-agentsDATA uninstall-eventsDATA \
+	uninstall-info-am uninstall-pixmapsDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-pixmapsDATA \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-info-am uninstall-pixmapsDATA
+	dvi-am html html-am info info-am install install-agentsDATA \
+	install-am install-data install-data-am install-eventsDATA \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-pixmapsDATA install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall \
+	uninstall-agentsDATA uninstall-am uninstall-eventsDATA \
+	uninstall-info-am uninstall-pixmapsDATA
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.