diff -Nurp gajim-0.8.orig/Makefile gajim-0.8/Makefile
--- gajim-0.8.orig/Makefile	2005-08-19 09:47:32.000000000 +0200
+++ gajim-0.8/Makefile	2005-08-20 13:09:31.000000000 +0200
@@ -8,10 +8,13 @@ DESTDIR		= 
 LIBDIR		= /lib
 MANDIR		= $(DESTDIR)$(PREFIX)/share/man
 
-FIND		= find . \( -name '*.glade' -o -name '*.py' -o -name '*.xpm' -o -name '*.gif' -o -name '*.png' -o -name '*.mo' -o -name '*.wav' \)
+FIND		= find . \( -name '*.glade' -o -name '*.py' -o -name '*.xpm' -o -name '*.gif' -o -name '*.png' -o -name '*.wav' \)
 
 FILES		= `$(FIND)`
 DIRS		= `$(FIND) -exec dirname {} \; | sort -u`
+FIND_PO		= find ./po \( -name '*.mo' \)
+FILES_PO	= `$(FIND_PO) | sed -e 's/^\.\/po/\./g'`
+DIRS_PO		= `$(FIND_PO) -exec dirname {} \; | sort -u | sed -e 's/^\.\/po/\./g'`
 FIND_LIB	= find . -name '*.so'
 FILES_LIB	= `$(FIND_LIB)`
 
@@ -67,6 +70,15 @@ install:
 		DST=`dirname "$$f"`; \
 		cp "$$f" "$(DESTDIR)$(PREFIX)/share/gajim/$$DST/"; \
 	done
+	for d in $(DIRS_PO) ; do \
+		if [ ! -d $(DESTDIR)$(PREFIX)/share/locale/$$d ] ; then \
+			mkdir -p "$(DESTDIR)$(PREFIX)/share/locale/$$d"; \
+		fi; \
+	done
+	for f in $(FILES_PO) ; do \
+		DST=`dirname "$$f"`; \
+		cp "./po/$$f" "$(DESTDIR)$(PREFIX)/share/locale/$$DST/"; \
+	done
 	cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/";
 	mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps";
 	cp data/pixmaps/gajim.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
diff -Nurp gajim-0.8.orig/src/common/i18n.py gajim-0.8/src/common/i18n.py
--- gajim-0.8.orig/src/common/i18n.py	2005-08-19 09:47:31.000000000 +0200
+++ gajim-0.8/src/common/i18n.py	2005-08-20 13:14:30.000000000 +0200
@@ -18,7 +18,7 @@
 ##
 
 APP = 'gajim'
-DIR = '../po'
+DIR = '../../locale'
 
 import locale
 import gettext