diff --git a/ChangeLog b/ChangeLog
index 76f5f9b7e..ebbe44a4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-28  Tim Waugh  <twaugh@redhat.com>
+	* configure.in: Fetch ChangeLog from srcdir, not builddir (fixes
+	'make distcheck').
+	* src/po/Makefile.am: Fetch zh_CN.po from srcdir, not builddir (fixes
+	'make distcheck').
+
 2003-09-27  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* doc/gramps-manual/C/filtref.xml: Manual corrections. 
 	* doc/gramps-manual/C/cmdline.xml: Likewise.
diff --git a/configure.in b/configure.in
index ebb6b851b..660c24862 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_PREREQ(2.57)
 AC_INIT(gramps, 0.9.4, gramps-bugs@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(src/gramps.py)
 AM_INIT_AUTOMAKE(1.6.3)
-RELEASE=0.CVS$(head -c 10 ChangeLog | tr -d '-')
+RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
 
 VERSIONSTRING=$VERSION
 if test x"$RELEASE" != "x"
diff --git a/src/po/Makefile.am b/src/po/Makefile.am
index d863af4fb..4db6a118a 100644
--- a/src/po/Makefile.am
+++ b/src/po/Makefile.am
@@ -24,8 +24,8 @@ SUFFIXES = .po .mo
 	$(MSGFMT) -v temp.po -o $@
 	rm temp.po
 
-zh_CN.mo: zh_CN.po
-	iconv -f GB2312 -t UTF-8 zh_CN.po > temp.po
+zh_CN.mo: $(top_srcdir)/src/po/zh_CN.po
+	iconv --from-code=GB2312 --to-code=UTF-8 $< -o temp.po
 	$(MSGFMT) -v temp.po -o $@
 	rm temp.po