diff --git a/src/Makefile.am b/src/Makefile.am
index 57c77369c..6938b020d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,7 @@ guile_vm_SOURCES = guile-vm.c
 guile_vm_LDADD = libguile-vm.la 
 guile_vm_LDFLAGS = $(GUILE_LDFLAGS)
 
-AM_CFLAGS = -Wall -g -pg
-guile_vm_LDFLAGS += -pg
+AM_CFLAGS = -Wall -g
 
 lib_LTLIBRARIES = libguile-vm.la
 libguile_vm_la_SOURCES =						\
@@ -13,13 +12,13 @@ libguile_vm_la_SOURCES =						\
 	envs.h frames.h instructions.h objcodes.h programs.h vm.h	\
 	vm_engine.h vm_expand.h
 libguile_vm_la_LDFLAGS = -version-info 0:0:0 -export-dynamic
-libguile_vm_la_LDFLAGS += -pg
 EXTRA_DIST = vm_engine.c vm_system.c vm_scheme.c vm_loader.c \
              guilec.in guile-disasm.in
 BUILT_SOURCES = vm_system.i vm_scheme.i vm_loader.i \
 	envs.x frames.x instructions.x objcodes.x programs.x vm.x
 
 INCLUDES = $(GUILE_CFLAGS)
+CLEANFILES = guilec guile-disasm
 DISTCLEANFILES = $(BUILT_SOURCES)
 MAINTAINERCLEANFILES = Makefile.in config.h.in stamp-h.in
 
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index c12e51622..d839ff349 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,7 +1,7 @@
 # The test programs.
 
 # The Libtool executable.
-GUILE_VM = $(top_srcdir)/src/guile-vm
+GUILE_VM = $(top_builddir)/src/guile-vm
 
 vm_test_files =					\
       t-basic-contructs.scm			\