diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index af9a7ce..73ca330 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -9,10 +9,10 @@ top_builddir = ..
 
 include $(top_builddir)/Makefile.include
 
-all: $(srcdir)/$(ELISP)
+all: $(filter-out %.elc,$(srcdir)/$(ELISP))
 
 install: all
-	if [ -n "$(ELISP)" ]; then for i in `echo $(ELISP)`; do \
+	if [ -n "$(filter-out %.elc,$(ELISP))" ]; then for i in `echo $(filter-out %.elc,$(ELISP))`; do \
 		$(INSTALL_DATA) $(srcdir)/$$i $(lispdir)/`basename $$i` ;\
 	done; fi
 
@@ -20,7 +20,7 @@ install: all
 	$(EMACS) -batch -l $(srcdir)/emacs/exec.el -exec '(byte-compile-file "$<")'
 
 uninstall:
-	if [ -n "$(ELISP)" ]; then for i in `echo $(ELISP)`; do \
+	if [ -n "$(filter-out %.elc,$(ELISP))" ]; then for i in `echo $(filter-out %.elc,$(ELISP))`; do \
 		rm -f $(lispdir)/$$i ;\
 	done; fi 
 
@@ -28,4 +28,4 @@ dist:
 	$(CP) -r $(srcdir) $(top_builddir)/gpm-$(release)/
 
 clean distclean:
-	$(RM) -f $(srcdir)/emacs/*.elc Makefile
+	$(RM) $(srcdir)/emacs/*.elc Makefile
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 709fa6d..7e1ef23 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -130,8 +130,8 @@ install:	all installdirs
 	#i keep all my infopages compressed and i'm tired to do it by
 	#hand, so check if there are any compressed pages and do this
 	#one too
-	-ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \
-		&& gzip -f $(infodir)/gpm.info
+	#-ls $(infodir)/*[-.]info.gz >/dev/null 2>&1 \
+	#	&& gzip -f $(infodir)/gpm.info
 	# Hmm.... shouldn't man pages be compressed too?
    # maybe they should, but at least at my system they are not.