diff --git a/ChangeLog b/ChangeLog
index 02bdf6fd2..682936b3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.am, conf/Makefile.common: Fix compilation problem with some
+	automake versions.
+
 2013-05-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/acpihalt.c: Fix handling of DSDT in presence of
diff --git a/Makefile.am b/Makefile.am
index 9ebe7a874..6032a3a26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,15 +71,15 @@ starfield_theme_files = $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/s
 if COND_STARFIELD
 starfield_DATA = dejavu_10.pf2 dejavu_12.pf2 dejavu_bold_14.pf2 dejavu_14.pf2 dejavu_16.pf2 $(starfield_theme_files)
 dejavu_10.pf2: $(DJVU_FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -s 10 -o $@ $(DJVU_FONT_SOURCE)
+	./grub-mkfont -s 10 -o $@ $(DJVU_FONT_SOURCE)
 dejavu_12.pf2: $(DJVU_FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -s 12 -o $@ $(DJVU_FONT_SOURCE)
+	./grub-mkfont -s 12 -o $@ $(DJVU_FONT_SOURCE)
 dejavu_14.pf2: $(DJVU_FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -s 14 -o $@ $(DJVU_FONT_SOURCE)
+	./grub-mkfont -s 14 -o $@ $(DJVU_FONT_SOURCE)
 dejavu_bold_14.pf2: $(DJVU_FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -b -s 14 -o $@ $(DJVU_FONT_SOURCE)
+	./grub-mkfont -b -s 14 -o $@ $(DJVU_FONT_SOURCE)
 dejavu_16.pf2: $(DJVU_FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -s 16 -o $@ $(DJVU_FONT_SOURCE)
+	./grub-mkfont -s 16 -o $@ $(DJVU_FONT_SOURCE)
 else
 starfield_DATA = 
 endif
@@ -88,7 +88,7 @@ EXTRA_DIST += $(starfield_theme_files)
 EXTRA_DIST += $(srcdir)/themes/starfield/src/slider_s.xcf $(srcdir)/themes/starfield/src/slider_n.xcf $(srcdir)/themes/starfield/src/slider_c.xcf $(srcdir)/themes/starfield/src/blob_nw.xcf $(srcdir)/themes/starfield/src/bootmenu/center.xcf $(srcdir)/themes/starfield/src/bootmenu/corner.xcf $(srcdir)/themes/starfield/src/bootmenu/side.xcf $(srcdir)/themes/starfield/src/terminalbox/side.xcf $(srcdir)/themes/starfield/src/terminalbox/corner.xcf $(srcdir)/themes/starfield/src/terminalbox/center.xcf
 
 unicode.pf2: $(FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE)
+	./grub-mkfont -o $@ $(FONT_SOURCE)
 CLEANFILES += unicode.pf2
 
 # Arrows and lines are needed to draw the menu, so always include them
@@ -96,27 +96,27 @@ UNICODE_ARROWS=0x2190-0x2193
 UNICODE_LINES=0x2501-0x251B
 
 ascii.pf2: $(FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
+	./grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
 CLEANFILES += ascii.pf2
 
 euro.pf2: $(FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x4ff,0x1e00-0x1fff,$(UNICODE_ARROWS),$(UNICODE_LINES)
+	./grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x4ff,0x1e00-0x1fff,$(UNICODE_ARROWS),$(UNICODE_LINES)
 CLEANFILES += euro.pf2
 
 ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
+	./grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
 CLEANFILES += ascii.bitmaps
 
 ascii.h: ascii.bitmaps grub-bin2h
-	$(builddir)/grub-bin2h ascii_bitmaps < $< > $@
+	./grub-bin2h ascii_bitmaps < $< > $@
 CLEANFILES += ascii.h $(top_builddir)/grub-core/include/ascii.h
 
 widthspec.bin: $(FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont --width-spec -o $@ $(FONT_SOURCE)
+	./grub-mkfont --width-spec -o $@ $(FONT_SOURCE)
 CLEANFILES += widthspec.bin
 
 widthspec.h: widthspec.bin grub-bin2h
-	$(builddir)/grub-bin2h widthspec < $< > $@
+	./grub-bin2h widthspec < $< > $@
 CLEANFILES += widthspec.h
 
 # Install config.h into platformdir
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 70bbf8b24..7543dadc5 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -54,7 +54,7 @@ CPPFLAGS_DEFAULT += -I$(top_srcdir)/include
 CPPFLAGS_DEFAULT += -I$(top_builddir)/include
 CPPFLAGS_DEFAULT += -I$(top_srcdir)/grub-core/lib/libgcrypt-grub/include
 CPPFLAGS_DEFAULT += -I$(top_srcdir)/grub-core/lib/libgcrypt-grub/src/
-CCASFLAGS_DEFAULT = -DASM_FILE=1
+CCASFLAGS_DEFAULT = $(CPPFLAGS_DEFAULT) -DASM_FILE=1
 
 LDADD_KERNEL =