diff --git a/checkin_notes b/checkin_notes
index 825a8c876c..d1be697824 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8841,3 +8841,10 @@ Charlie 30 Oct 2009
     mac_build/
         boinc.xcodeproj/
             project.pbxproj
+
+Rom    30 Oct 2009
+    - Use mo files instead of po files when executing make install.
+      Fixes #940
+      
+    locale/
+        Makefile.am
diff --git a/locale/Makefile.am b/locale/Makefile.am
index e7d841423a..94cb7e66c7 100644
--- a/locale/Makefile.am
+++ b/locale/Makefile.am
@@ -5,29 +5,25 @@ include $(top_srcdir)/Makefile.incl
 datadir = $(prefix)/share/locale 
 
 locale_dirs = \
-        af_ZA \
 	ar \
 	be \
 	bg \
 	ca \
 	cs \
-	cs_CZ \
 	da \
 	de \
 	el \
-	en_US \
 	es \
-	eu \
-	fi \
+	fa \
 	fr \
+	gl \
 	hr \
 	hu \
 	it \
 	ja \
-	ko_KR \
+	ko \
 	lt \
 	lv \
-	nb \
 	nl \
 	pl \
 	pt \
@@ -35,7 +31,6 @@ locale_dirs = \
 	ro \
 	ru \
 	sk \
-	sl \
 	sv_SE \
 	tr \
 	uk \
@@ -46,8 +41,8 @@ install-exec-hook:
 	mydir=$(DESTDIR)$(datadir) ;\
 	for ldir in $(locale_dirs) ; do \
 	  $(INSTALL) -d $$mydir/$$ldir ; \
-	  if [ -f $$ldir/BOINC-Manager.po ] ; then \
-	    $(INSTALL) $$ldir/BOINC-Manager.po $$mydir/$$ldir/BOINC-Manager.po ; \
+	  if [ -f $$ldir/BOINC-Manager.mo ] ; then \
+	    $(INSTALL) $$ldir/BOINC-Manager.mo $$mydir/$$ldir/BOINC-Manager.mo ; \
 	  fi ;\
 	done