diff --git a/Makefile.am b/Makefile.am
index 11482a879..553ba2462 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -96,6 +96,8 @@ audacity$(EXEEXT): src/audacity$(EXEEXT)
 modules:
 	mkdir -p modules
 	(cd lib-src/mod-nyq-bench && make clean && make && cp .libs/mod-nyq-bench.so ../../modules)
+	(cd lib-src/mod-script-pipe && make clean && make && cp .libs/mod-script-pipe.so ../../modules)
+	(cd lib-src/mod-null && make clean && make && cp .libs/mod-null.so ../../modules)
 
 .PHONY: modules
 
diff --git a/lib-src/mod-null/Makefile.am b/lib-src/mod-null/Makefile.am
new file mode 100644
index 000000000..a34fbd039
--- /dev/null
+++ b/lib-src/mod-null/Makefile.am
@@ -0,0 +1,13 @@
+pkglib_LTLIBRARIES = mod-null.la
+
+ACLOCAL_AMFLAGS = ${ACLOCAL_AMFLAGS} -I m4
+
+mod_null_la_CPPFLAGS = $(WX_CXXFLAGS) -I$(top_srcdir)/../../include -I$(top_srcdir)/../../src -I$(top_builddir)/../../src -I$(top_srcdir)/../portaudio-v19/include 
+mod_null_la_LIBADD = $(WX_LIBS)
+mod_null_la_LDFLAGS = -module
+
+mod_null_la_SOURCES = \
+	ModNullCallback.cpp \
+	ModNullCallback.h
+	$(NULL)
+
diff --git a/lib-src/mod-nyq-bench/Makefile.am b/lib-src/mod-nyq-bench/Makefile.am
index 68fbaa03c..9447c0e2d 100644
--- a/lib-src/mod-nyq-bench/Makefile.am
+++ b/lib-src/mod-nyq-bench/Makefile.am
@@ -1,5 +1,7 @@
 pkglib_LTLIBRARIES = mod-nyq-bench.la
 
+ACLOCAL_AMFLAGS = ${ACLOCAL_AMFLAGS} -I m4
+
 mod_nyq_bench_la_CPPFLAGS = $(WX_CXXFLAGS) -I$(top_srcdir)/../../include -I$(top_srcdir)/../../src -I$(top_builddir)/../../src -I$(top_srcdir)/../portaudio-v19/include -I$(top_srcdir)/../portmixer/include -I$(top_srcdir)/../libnyquist
 mod_nyq_bench_la_LIBADD = $(WX_LIBS)
 mod_nyq_bench_la_LDFLAGS = -module
diff --git a/lib-src/mod-script-pipe/Makefile b/lib-src/mod-script-pipe/Makefile
deleted file mode 100644
index df0a14c09..000000000
--- a/lib-src/mod-script-pipe/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# -----------------------------------------------------------------------------
-# Build mod-script-pipe plugin
-#
-# EXPERIMENTAL!
-# (Based on a Makefile by Leland)
-#
-
-# -----------------------------------------------------------------------------
-# NOTE: Change this to the base of the Audacity source distribution, or specify
-#       via command line or environment
-#
-AUDACITY_DIR = ../..
-
-# -----------------------------------------------------------------------------
-# NOTE: Set to the names of your objects and final module name
-#
-OBJS = PipeServer.o ScripterCallback.o
-MOD = mod-script-pipe.so
-
-# -----------------------------------------------------------------------------
-# NOTE: Set any custom flags you may need
-#
-CXXFLAGS += -Wall -std=gnu++11
-CXXFLAGS += -DCC_HASVISIBILITY # Normally provided by configure
-CXXFLAGS += -DBUILDING_SCRIPT_PIPE
-CXXFLAGS += ${shell echo @WX_CXXFLAGS@ | ../../config.status --file=- }
-CXXFLAGS += -D__WXDEBUG__ -D__WXGTK__
-
-# -----------------------------------------------------------------------------
-# Hopefully the rest is generic enough to satisfy most needs
-# -----------------------------------------------------------------------------
-
-CXXFLAGS += -DAUDACITY_DLL_API= -I$(AUDACITY_DIR)/include -I$(AUDACITY_DIR)/src -I$(AUDACITY_DIR)/lib-src/portaudio-v19/include
-CXXFLAGS += ${shell echo @CPPFLAGS@ | ../../config.status --file=- }
-CXXFLAGS += ${shell echo @CXXFLAGS@ | ../../config.status --file=- | sed -e 's@$$(top_srcdir)@$(AUDACITY_DIR)@g' }
-CXXFLAGS += ${shell echo @LIBNYQUIST_CFLAGS@ | ../../config.status --file=- | sed -e 's@$$(top_srcdir)@$(AUDACITY_DIR)@g' }
-CXXFLAGS += ${shell echo @WX_CXXFLAGS@ | ../../config.status --file=- }
-LDFLAGS += ${shell echo @LIBS@ | ../../config.status --file=- }
-
-SYS = $(shell uname -s)
-
-ifeq ($(SYS),Darwin)
-   CXXFLAGS += -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 
-   LDFLAGS += $(CXXFLAGS) -dynamiclib -undefined suppress
-else
-   CXXFLAGS += -fPIC
-   LDFLAGS += -shared
-endif
-
-LD = g++
-
-all: basecheck $(MOD)
-
-# -----------------------------------------------------------------------------
-# Make sure we can get to the Audacity source
-#
-basecheck:
-	@if test -z "$(AUDACITY_DIR)/src/Audacity.h"                   ; \
-	then                                                             \
-	  echo "You need to set AUDACITY_DIR equal to the base"        ; \
-	  echo "of your Audacity source directory.  You can do"        ; \
-	  echo "this via an environemnt variable, include it on"       ; \
-	  echo "the make command line or set it at the top of"         ; \
-	  echo "the Makefile."                                         ; \
-     exit 1                                                       ; \
-	fi
-
-# -----------------------------------------------------------------------------
-# Build it
-#
-$(MOD): $(OBJS)
-	$(LD) $(LDFLAGS) -o $(MOD) $(OBJS)
-	@mkdir -p $(AUDACITY_DIR)/modules
-	@cp $(MOD) $(AUDACITY_DIR)/modules
-	@echo
-	@echo "$(MOD) has been copied to $(AUDACITY_DIR)/modules"
-	@echo
-
-# -----------------------------------------------------------------------------
-# Cleanup
-#
-clean: 
-	-rm $(MOD) $(OBJS)
diff --git a/lib-src/mod-script-pipe/Makefile.am b/lib-src/mod-script-pipe/Makefile.am
new file mode 100644
index 000000000..e22c9dbc8
--- /dev/null
+++ b/lib-src/mod-script-pipe/Makefile.am
@@ -0,0 +1,15 @@
+pkglib_LTLIBRARIES = mod-script-pipe.la
+
+ACLOCAL_AMFLAGS = ${ACLOCAL_AMFLAGS} -I m4
+
+mod_script_pipe_la_CPPFLAGS = $(WX_CXXFLAGS) -DBUILDING_SCRIPT_PIPE -I$(top_srcdir)/../../include -I$(top_srcdir)/../../src -I$(top_builddir)/../../src -I$(top_srcdir)/../portaudio-v19/include 
+mod_script_pipe_la_LIBADD = $(WX_LIBS)
+mod_script_pipe_la_LDFLAGS = -module
+
+mod_script_pipe_la_SOURCES = \
+	PipeServer.cpp \
+	PipeServer.h \
+	ScripterCallback.cpp \
+	ScripterCallback.h
+	$(NULL)
+