diff --git a/blocks/INSTALL b/blocks/INSTALL
index 7d1c323..a1e89e1 100644
--- a/blocks/INSTALL
+++ b/blocks/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
diff --git a/blocks/Makefile.common b/blocks/Makefile.common
index cfa5b18..f9c7f21 100644
--- a/blocks/Makefile.common
+++ b/blocks/Makefile.common
@@ -26,6 +26,9 @@ grincludedir   = $(includedir)/gnuradio
 # swig includes 
 swigincludedir = $(grincludedir)/swig
 
+# gruel includes
+gruelincludedir = $(includedir)/gruel
+
 # Install this stuff in the appropriate subdirectory
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -35,7 +38,7 @@ grpyexecdir = $(pyexecdir)/gnuradio
 
 # swig flags
 SWIGPYTHONFLAGS = -fvirtual -python -modern
-SWIGGRFLAGS = -I$(GNURADIO_CORE_INCLUDEDIR)/swig -I$(GNURADIO_CORE_INCLUDEDIR)
+SWIGGRFLAGS = -I$(GNURADIO_CORE_INCLUDEDIR)/swig -I$(gruelincludedir)/swig -I$(GNURADIO_CORE_INCLUDEDIR)
 
 # Don't assume that make predefines $(RM), because BSD make does
 # not. We define it now in configure.ac using AM_PATH_PROG, but now
diff --git a/blocks/src/lib/software_imbe_decoder.h b/blocks/src/lib/software_imbe_decoder.h
index f4924fc..57fe413 100644
--- a/blocks/src/lib/software_imbe_decoder.h
+++ b/blocks/src/lib/software_imbe_decoder.h
@@ -85,7 +85,7 @@ private:
 
 	uint32_t pngen15(uint32_t& pn);
 	uint32_t pngen23(uint32_t& pn);
-	uint32_t next_t(uint32_t u);
+	uint32_t next_u(uint32_t u);
 	void decode_audio(uint8_t *);
 	void decode_spectral_amplitudes(int, int );
 	void decode_vuv(int );