diff --git a/tests/Makefile.am b/tests/Makefile.am
index 833a60e44..a63118483 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,12 +4,13 @@ DEJATOOL = testfreq testbcd testloc rigctl
 
 DISTCLEANFILES = rigctl.log rigctl.sum testbcd.log testbcd.sum
 
-bin_PROGRAMS = rigctl rotctl
-man_MANS = rigctl.1 rotctl.1
+bin_PROGRAMS = rigctl rigmem rotctl
+man_MANS = rigctl.1 rigmem.1 rotctl.1
 
 check_PROGRAMS = dumpmem testrig testtrn testbcd testfreq listrigs testloc rig_bench @RIGMATRIX@
 
 rigctl_SOURCES = rigctl.c dumpcaps.c sprintflst.c
+rigmem_SOURCES = rigmem.c memsave.c memload.c memcsv.c sprintflst.c
 noinst_HEADERS = sprintflst.h
 
 EXTRA_PROGRAMS = rigmatrix
@@ -18,6 +19,8 @@ EXTRA_PROGRAMS = rigmatrix
 LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la
 DEPENDENCIES = $(top_builddir)/src/libhamlib.la
 
+rigmem_CFLAGS = $(AM_CFLAGS) @XML_CFLAGS@
+
 ## Linker options
 listrigs_LDFLAGS = @BACKENDLNK@
 dumpmem_LDFLAGS = @BACKENDLNK@
@@ -25,6 +28,7 @@ testrig_LDFLAGS = @BACKENDLNK@
 rig_bench_LDFLAGS = $(top_builddir)/lib/libmisc.la @BACKENDLNK@
 testtrn_LDFLAGS = @BACKENDLNK@
 rigctl_LDFLAGS = @BACKENDLNK@
+rigmem_LDFLAGS = @BACKENDLNK@ @XML_LIBS@
 rotctl_LDFLAGS = @ROT_BACKENDLNK@
  
 # temporary hack
@@ -42,6 +46,7 @@ rig_bench_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
 testtrn_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
 listrigs_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
 rigctl_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
+rigmem_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
 rotctl_DEPENDENCIES = $(DEPENDENCIES) @ROT_BACKENDEPS@
 rigmatrix_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
 
diff --git a/tests/README b/tests/README
index 041ba8f8d..cedf6fb87 100644
--- a/tests/README
+++ b/tests/README
@@ -27,4 +27,5 @@ testfreq  -	Simple program to test Freq conversion, takes a number as arg.
 testrig   -	Sample program calling common API calls, uses rig_probe
 testtrn   -	Sample program using event notification (transceive mode)
 rigctl	  -	Combined tool to execute any call of the API, see man page
+rigmem	  -	Combined tool to load/save content of rig memory, see man page