diff --git a/Makefile.am b/Makefile.am
index c3e529d..cde72e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,9 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-EXTRA_DIST = \
+include $(top_srcdir)/Makefile.common
+
+EXTRA_DIST += \
 	usrp.pc.in \
 	usrp.iss.in \
 	usrp.inf
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6099ebb..0eddc62 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = other
 man3dir = $(mandir)/man3
 usrp_docdir  = $(prefix)/share/doc/usrp-$(DOCVER)
 
-EXTRA_DIST = 			\
+EXTRA_DIST += 			\
 	Doxyfile.in		\
 	ddc.eps			\
 	ddc.png			\
diff --git a/doc/other/Makefile.am b/doc/other/Makefile.am
index ca1de7c..815553a 100644
--- a/doc/other/Makefile.am
+++ b/doc/other/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,5 +21,5 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST =			\
+EXTRA_DIST +=			\
 	mainpage.dox		
diff --git a/host/include/usrp/Makefile.am b/host/include/usrp/Makefile.am
index 2aaf66a..1950431 100644
--- a/host/include/usrp/Makefile.am
+++ b/host/include/usrp/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2009 Free Software Foundation, Inc.
+# Copyright 2009,2010 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -47,10 +47,8 @@ usrpinclude_HEADERS = \
 	usrp_subdev_spec.h \
 	usrp_tune_result.h
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	libusb_types.h.in
 
-if PYTHON
 swiginclude_HEADERS = \
 	db_base.i
-endif
diff --git a/host/include/usrp/db_base.i b/host/include/usrp/db_base.i
index 78c72b8..fdabd4f 100644
--- a/host/include/usrp/db_base.i
+++ b/host/include/usrp/db_base.i
@@ -91,6 +91,7 @@ typedef boost::shared_ptr<db_base> db_base_sptr;
 %template(db_base_sptr_vector) std::vector<db_base_sptr>;
 %template(db_base_sptr_vector_vector) std::vector<std::vector<db_base_sptr> >;
 
+#ifdef SWIGPYTHON
 // Set better class name in Python
 // Enable freq_range and gain_range from public methods of class not implemented in C++
 // And create a dummy wrapper for backwards compatability with some of the example code
@@ -98,5 +99,5 @@ typedef boost::shared_ptr<db_base> db_base_sptr;
   db_base_sptr.__repr__ = lambda self: "<db_base::%s>" % (self.name(),)
   db_base_sptr.freq_range = lambda self: (self.freq_min(), self.freq_max(), 1)
   db_base_sptr.gain_range = lambda self: (self.gain_min(), self.gain_max(), self.gain_db_per_step())
-
 %}
+#endif
diff --git a/host/include/usrp/usrp_basic.h b/host/include/usrp/usrp_basic.h
index c24630e..b76493e 100644
--- a/host/include/usrp/usrp_basic.h
+++ b/host/include/usrp/usrp_basic.h
@@ -88,7 +88,7 @@ protected:
    */
   std::vector< std::vector<db_base_sptr> > d_db;
 
-  //! One time call, made only only from usrp_standard_*::make after shared_ptr is created.
+  // One time call, made only only from usrp_standard_*::make after shared_ptr is created.
   void init_db(usrp_basic_sptr u);
 
 
diff --git a/host/lib/Makefile.am b/host/lib/Makefile.am
index b8b60fa..96ab558 100644
--- a/host/lib/Makefile.am
+++ b/host/lib/Makefile.am
@@ -42,11 +42,11 @@ libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
 libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS)
 endif
 
-EXTRA_DIST = 				\
+EXTRA_DIST += 				\
 	std_paths.h.in			\
 	usrp_dbid.dat
 
-BUILT_SOURCES = $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
+BUILT_SOURCES += $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
 
 BUILT_SOURCES += usrp_dbid.cc \
 		 usrp_dbid.py
diff --git a/host/misc/Makefile.am b/host/misc/Makefile.am
index 45c940f..935dc74 100644
--- a/host/misc/Makefile.am
+++ b/host/misc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2003,2004 Free Software Foundation, Inc.
+# Copyright 2003,2004,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	getopt.c getopt.h \
 	gettimeofday.c \
 	tempname.c mkstemp.c \
diff --git a/host/swig/.gitignore b/host/swig/.gitignore
index 3a08165..9897dac 100644
--- a/host/swig/.gitignore
+++ b/host/swig/.gitignore
@@ -6,9 +6,11 @@
 /.libs
 /*.la
 /*.lo
-/gnuradio_swig_python.cc
-/gnuradio_swig_python.py
 /usrp_prims.cc
 /usrp_prims.py
+/usrp_prims.scm
 /prims.cc
 /prims.py
+/gnuradio
+/guile
+/python
diff --git a/host/swig/Makefile.am b/host/swig/Makefile.am
index c846f26..5baeff4 100644
--- a/host/swig/Makefile.am
+++ b/host/swig/Makefile.am
@@ -20,6 +20,7 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
 AM_CPPFLAGS =			\
 	$(USRP_INCLUDES)	\
@@ -53,11 +54,3 @@ usrp_prims_la_swig_libadd =	\
 usrp_prims_python =		\
 	__init__.py		\
 	usrp_fpga_regs.py
-
-include $(top_srcdir)/Makefile.swig
-
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES = $(swig_built_sources)
-
-# Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)
diff --git a/host/swig/Makefile.swig.gen b/host/swig/Makefile.swig.gen
index 00de3e4..b4cc97c 100644
--- a/host/swig/Makefile.swig.gen
+++ b/host/swig/Makefile.swig.gen
@@ -38,6 +38,16 @@ usrp_prims_pylibdir_category ?= $(usrp_prims_pythondir_category)
 usrp_prims_pythondir = $(pythondir)/$(usrp_prims_pythondir_category)
 usrp_prims_pylibdir = $(pyexecdir)/$(usrp_prims_pylibdir_category)
 
+# The .so libraries for the guile modules get installed whereever guile
+# is installed, usually /usr/lib/guile/gnuradio/
+# FIXME: determince whether these should be installed with gnuradio.
+usrp_prims_scmlibdir = $(libdir)
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/usrp_prims
+# FIXME: determince whether these should be installed with gnuradio.
+usrp_prims_scmdir = $(guiledir)
+
 ## SWIG headers are always installed into the same directory.
 
 usrp_prims_swigincludedir = $(swigincludedir)
@@ -57,23 +67,10 @@ usrp_prims_swigincludedir = $(swigincludedir)
 ## right thing.  For more info, see <
 ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
 
-## Stamps used to ensure parallel make does the right thing.  These
-## are removed by "make clean", but otherwise unused except during the
-## parallel built.  These will not be included in a tarball, because
-## the SWIG-generated files will be removed from the distribution.
-
-STAMPS += $(DEPDIR)/usrp_prims-generate-*
-
 ## Other cleaned files: dependency files generated by SWIG or this Makefile
 
 MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
-## Add the .py and .cc files to the list of SWIG built sources.  The
-## .h file is sometimes built, but not always ... so that one has to
-## be added manually by the including Makefile.am .
-
-swig_built_sources += usrp_prims.py usrp_prims.cc
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -82,13 +79,18 @@ usrp_prims_swiginclude_HEADERS =		\
 	usrp_prims.i			\
 	$(usrp_prims_swiginclude_headers)
 
+if PYTHON
 usrp_prims_pylib_LTLIBRARIES =		\
 	_usrp_prims.la
 
 _usrp_prims_la_SOURCES = 			\
-	usrp_prims.cc			\
+	python/usrp_prims.cc		\
 	$(usrp_prims_la_swig_sources)
 
+usrp_prims_python_PYTHON =			\
+	usrp_prims.py			\
+	$(usrp_prims_python)
+
 _usrp_prims_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(usrp_prims_la_swig_libadd)
@@ -99,161 +101,45 @@ _usrp_prims_la_LDFLAGS =			\
 
 _usrp_prims_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(usrp_prims_la_swig_cxxflags)
 
-usrp_prims_python_PYTHON =			\
-	usrp_prims.py			\
-	$(usrp_prims_python)
+python/usrp_prims.cc: usrp_prims.py
+usrp_prims.py: usrp_prims.i
 
-## Entry rule for running SWIG
+# Include the python dependencies for this file
+-include python/usrp_prims.d
 
-usrp_prims.h usrp_prims.py usrp_prims.cc: usrp_prims.i
-## This rule will get called only when MAKE decides that one of the
-## targets needs to be created or re-created, because:
-##
-## * The .i file is newer than any or all of the generated files;
-##
-## * Any or all of the .cc, .h, or .py files does not exist and is
-##   needed (in the case this file is not needed, the rule for it is
-##   ignored); or
-##
-## * Some SWIG-based dependecy of the .cc file isn't met and hence the
-##   .cc file needs be be regenerated.  Explanation: Because MAKE
-##   knows how to handle dependencies for .cc files (regardless of
-##   their name or extension), then the .cc file is used as a target
-##   instead of the .i file -- but with the dependencies of the .i
-##   file.  It is this last reason why the line:
-##
-##     	if test -f $@; then :; else
-##
-##   cannot be used in this case: If a .i file dependecy is not met,
-##   then the .cc file needs to be rebuilt.  But if the stamp is newer
-##   than the .cc file, and the .cc file exists, then in the original
-##   version (with the 'test' above) the internal MAKE call will not
-##   be issued and hence the .cc file will not be rebuilt.
-##
-## Once execution gets to here, it should always proceed no matter the
-## state of a stamp (as discussed in link above).  The
-## $(DEPDIR)/usrp_prims-generate stuff is used to allow for parallel
-## builds to "do the right thing".  The stamp has no relationship with
-## either the target files or dependency file; it is used solely for
-## the protection of multiple builds during a given call to MAKE.
-##
-## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM
-## (15).  At a caught signal, the quoted command will be issued before
-## exiting.  In this case, remove any stamp, whether temporary of not.
-## The trap is valid until the process exits; the process includes all
-## commands appended via "\"s.
-##
-	trap 'rm -rf $(DEPDIR)/usrp_prims-generate-*' 1 2 13 15; \
-##
-## Create a temporary directory, which acts as a lock.  The first
-## process to create the directory will succeed and issue the MAKE
-## command to do the actual work, while all subsequent processes will
-## fail -- leading them to wait for the first process to finish.
-##
-	if mkdir $(DEPDIR)/usrp_prims-generate-lock 2>/dev/null; then \
-##
-## This code is being executed by the first process to succeed in
-## creating the directory lock.
-##
-## Remove the stamp associated with this filename.
-##
-		rm -f $(DEPDIR)/usrp_prims-generate-stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_prims-generate-stamp WHAT=$<; \
-##
-## Now that the .cc, .h, and .py files have been (re)created from the
-## .i file, future checking of this rule during the same MAKE
-## execution will come back that the rule doesn't need to be executed
-## because none of the conditions mentioned at the start of this rule
-## will be positive.  Remove the the directory lock, which frees up
-## any waiting process(es) to continue.
-##
-		rmdir $(DEPDIR)/usrp_prims-generate-lock; \
-	else \
-##
-## This code is being executed by any follower processes while the
-## directory lock is in place.
-##
-## Wait until the first process is done, testing once per second.
-##
-		while test -d $(DEPDIR)/usrp_prims-generate-lock; do \
-			sleep 1; \
-		done; \
-##
-## Succeed if and only if the first process succeeded; exit this
-## process returning the status of the generated stamp.
-##
-		test -f $(DEPDIR)/usrp_prims-generate-stamp; \
-		exit $$?; \
-	fi;
+endif		# end of if python
 
-$(DEPDIR)/usrp_prims-generate-stamp:
-## This rule will be called only by the first process issuing the
-## above rule to succeed in creating the lock directory, after
-## removing the actual stamp file in order to guarantee that MAKE will
-## execute this rule.
-##
-## Call SWIG to generate the various output files; special
-## post-processing on 'mingw32' host OS for the dependency file.
-##
-	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_prims_swig_args) \
-		-MD -MF $(DEPDIR)/usrp_prims.Std \
-		-module usrp_prims -o usrp_prims.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/usrp_prims.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_prims.Std \
-			> $(DEPDIR)/usrp_prims.Sd; \
-		$(RM) $(DEPDIR)/usrp_prims.Std; \
-		$(MV) $(DEPDIR)/usrp_prims.Sd $(DEPDIR)/usrp_prims.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/usrp_prims.S*; exit 1; \
-	fi;
-##
-## Mess with the SWIG output .Std dependency file, to create a
-## dependecy file valid for the input .i file: Basically, simulate the
-## dependency file created for libraries by GNU's libtool for C++,
-## where all of the dependencies for the target are first listed, then
-## each individual dependency is listed as a target with no further
-## dependencies.
-##
-## (1) remove the current dependency file
-##
-	$(RM) $(DEPDIR)/usrp_prims.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/usrp_prims.Std $(DEPDIR)/usrp_prims.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/usrp_prims.d
-##
-## (4) from the SWIG file, remove the first line (the target); remove
-##     trailing " \" and " " from each line.  Append ":" to each line,
-##     followed by 2 carriage returns, then append this to the end of
-##     the dependency file.
-##
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_prims.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_prims.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/usrp_prims.Std
-##
-## Create the stamp for this filename generation, to signal success in
-## executing this rule; allows other threads waiting on this process
-## to continue.
-##
-	touch $(DEPDIR)/usrp_prims-generate-stamp
+if GUILE
 
-# KLUDGE: Force runtime include of a SWIG dependency file.  This is
-# not guaranteed to be portable, but will probably work.  If it works,
-# we have accurate dependencies for our swig stuff, which is good.
+usrp_prims_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-usrp_prims.la
+libguile_gnuradio_usrp_prims_la_SOURCES =	\
+	guile/usrp_prims.cc			\
+	$(usrp_prims_la_swig_sources)
+nobase_usrp_prims_scm_DATA = 		\
+	gnuradio/usrp_prims.scm 		\
+	gnuradio/usrp_prims-primitive.scm
+libguile_gnuradio_usrp_prims_la_LIBADD = 	\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(usrp_prims_la_swig_libadd)
+libguile_gnuradio_usrp_prims_la_LDFLAGS = 	\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(usrp_prims_la_swig_ldflags)
+libguile_gnuradio_usrp_prims_la_CXXFLAGS = 	\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(usrp_prims_la_swig_cxxflags)
+
+guile/usrp_prims.cc: gnuradio/usrp_prims.scm
+gnuradio/usrp_prims.scm: usrp_prims.i
+gnuradio/usrp_prims-primitive.scm: gnuradio/usrp_prims.scm
+
+# Include the guile dependencies for this file
+-include guile/usrp_prims.d
+
+endif				# end of GUILE
 
-@am__include@ @am__quote@./$(DEPDIR)/usrp_prims.d@am__quote@