diff --git a/ChangeLog b/ChangeLog
index 345ea8ae2..868fd5c13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,23 @@
 	* util/grub.d/30_os-prober.in: Cope with Linux entries where
 	root and /boot are on different devices.
 
+2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
+
+	Fix build for srcdir != objdir.
+
+	* Makefile.in (po/$(PACKAGE).pot): Rename to ...
+	($(srcdir)/po/$(PACKAGE).pot): ... this.  Run $(XGETTEXT) from
+	$(srcdir).
+	($(foreach lang, $(LINGUAS), po/$(lang).po)): Rename to ...
+	($(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): ... this. Use $^
+	reference for input.
+
+2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/grub-mkrescue.in: Use source directory direcly (without copiing
+	or hardlinking it).  Remove -J option, Joliet is not compatible with
+	multiple source directories.
+
 2009-11-21  Carles Pina i Estany <carles@pina.cat>
 2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
 
diff --git a/Makefile.in b/Makefile.in
index 43528c534..edc6c3853 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -472,12 +472,12 @@ gensymlist.sh: gensymlist.sh.in config.status
 genkernsyms.sh: genkernsyms.sh.in config.status
 	$(SHELL) ./config.status
 
-po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell
-	$(XGETTEXT) --from-code=utf-8 -o $@ -f $< --keyword=_
-	$(XGETTEXT) --from-code=utf-8 -o $@ -f po/POTFILES-shell -j --language=Shell
+$(srcdir)/po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell
+	cd $(srcdir) && $(XGETTEXT) --from-code=utf-8 -o $@ -f $< --keyword=_
+	cd $(srcdir) && $(XGETTEXT) --from-code=utf-8 -o $@ -f po/POTFILES-shell -j --language=Shell
 
-$(foreach lang, $(LINGUAS), po/$(lang).po): po/$(PACKAGE).pot
-	$(MSGMERGE) -U $@ po/$(PACKAGE).pot
+$(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): po/$(PACKAGE).pot
+	$(MSGMERGE) -U $@ $^
 
 po/%.mo: po/%.po
 	$(MKDIR_P) $$(dirname $@)
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 23ac4e1e8..6f7d3338c 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -142,13 +142,6 @@ EOF
     grub_mkisofs_arguments="${grub_mkisofs_arguments} --modification-date=$(echo ${iso_uuid} | sed -e s/-//g)"
 fi
 
-if [ "${source}" != "" ] ; then
-    for d in ${source}; do
-      echo "Processing $d"
-      cp -dpRl "${d}" ${iso9660_dir}/
-    done
-fi
-
 # build eltorito core.img
 if test -e "${pc_dir}" ; then
     echo "Generates eltorito"
@@ -170,7 +163,7 @@ if test -e "${pc_dir}" ; then
 fi
 
 # build iso image
-grub-mkisofs ${grub_mkisofs_arguments} -o ${output_image} -r -J ${iso9660_dir}
+grub-mkisofs ${grub_mkisofs_arguments} -o ${output_image} -r ${iso9660_dir} ${source}
 rm -rf ${iso9660_dir}
 
 exit 0