diff --git a/Makefile.am b/Makefile.am
index 530a8a39..342a836e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ SUBDIRS = \
   borrow/pgplot \
   borrow/linpack \
   borrow/wcslib \
+  borrow/rpfits \
   src/subs \
   src/scripts \
   src/scripts/ata/rapid \
diff --git a/borrow/rpfits/Makefile.am b/borrow/rpfits/Makefile.am
new file mode 100644
index 00000000..6870c079
--- /dev/null
+++ b/borrow/rpfits/Makefile.am
@@ -0,0 +1,30 @@
+## The wcslib source tree includes a "GNUmakefile", which would override
+## our Makefiles when using GNU make ... which we require. Automake
+## recurses into the PWD for some operations, so we need to specify
+## AM_MAKEFLAGS here the same way we do in the toplevel Makefile.am
+
+AM_MAKEFLAGS = -f Makefile
+
+lib_LTLIBRARIES = libmir_rpfits.la
+
+rpfcincdir = $(includedir)/miriad-c/rpfits
+rpffincdir = $(includedir)/miriad-f/rpfits
+
+rpfcinc_HEADERS = code/RPFITS.h
+rpffinc_HEADERS = code/rpfits.inc
+
+libmir_rpfits_la_SOURCES = \
+ $(rpfcinc_HEADERS) \
+ $(rpffinc_HEADERS) \
+ code/datfit.f \
+ code/dconv.f \
+ code/ljusty.f \
+ code/nchar.f \
+ code/rjusty.f \
+ code/rpferr.f \
+ code/rpfitsin.f \
+ code/rpfitsout.f \
+ code/rpfits_tables.f \
+ code/utdate.c \
+ code/linux/atio.f \
+ code/linux/cvt_ieee.f
diff --git a/configure.ac b/configure.ac
index 7567045f..813d7682 100644
--- a/configure.ac
+++ b/configure.ac
@@ -468,6 +468,7 @@ AC_CONFIG_FILES([
     src/scripts/Makefile
     src/scripts/ata/rapid/Makefile
     borrow/linpack/Makefile
+    borrow/rpfits/Makefile
     borrow/wcslib/Makefile
     src/prog/analysis/Makefile
     src/prog/calib/Makefile
diff --git a/src/prog/atnf/Makefile.am b/src/prog/atnf/Makefile.am
index 01fbd8a4..41f4fdff 100644
--- a/src/prog/atnf/Makefile.am
+++ b/src/prog/atnf/Makefile.am
@@ -1,23 +1,25 @@
 include $(top_srcdir)/mircommon.mak
 
-# We do not build atlod, fakeotf, mopfix, or wblod, because they
-# require the rpfits library. This resides in borrow/rpfits/, but I
-# don't feel like hooking it up to autotools right now. If someone
-# needs one of these tasks, I'll look into hooking it up.
+# A few of these programs need the RPFITS library from borrow/rpfits.
 
 LDADD = $(prog_libs)
+rpfits_libs = $(top_builddir)/borrow/rpfits/libmir_rpfits.la
 
 ftasks = \
-  at_mfcal at_moment at_uvlist at_uvplt atfix atmos atrtfix atscfix attsys atwvr \
-  elevcor lagflg mbspect mfboot plboot plplt wbplt
+ at_mfcal at_moment at_uvlist at_uvplt atfix atlod atmos atrtfix atscfix \
+ attsys atwvr elevcor fakeotf lagflg mbspect mfboot mopfix plboot plplt \
+ wblod wbplt
 bin_PROGRAMS = $(ftasks)
 CLEANFILES = $(ftasks:=.f)
 EXTRA_DIST = $(ftasks:=.for)
 
-noinst_HEADERS = \
-  at_uvlist.h atfix.h atmos.h mbspect.h mfcal.h wbcomm.h
+atlod_LDADD = $(prog_libs) $(rpfits_libs)
+fakeotf_LDADD = $(prog_libs) $(rpfits_libs)
+mopfix_LDADD = $(prog_libs) $(rpfits_libs)
+wblod_LDADD = $(prog_libs) $(rpfits_libs)
 
-EXTRA_DIST += atlod.for atlod.h mopfix.for wblod.for wblod.h
+noinst_HEADERS = \
+  at_uvlist.h atfix.h atlod.h atmos.h mbspect.h mfcal.h wbcomm.h wblod.h
 
 dist-hook:
 	-rm -f $(distdir)/*.f