diff --git a/Makefile b/Makefile
index 8a9bb56..b4e41c2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,24 @@
 # Makefile for source rpm: systemtap
-# $Id: Makefile,v 1.7 2006/05/05 22:12:26 fche Exp $
+# $Id: Makefile,v 1.2 2006/07/19 22:31:35 roland Exp $
 NAME := systemtap
 SPECFILE = $(firstword $(wildcard *.spec))
 
-include ../common/Makefile.common
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
 
 tarball = systemtap-$(VERSION).tar.gz