diff --git a/configure.ac b/configure.ac
index a59da93..59e7d47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl
 dnl +------------------------
 dnl | Initialize package info
 dnl +------------------------
-AC_INIT([HEALPix], [3.30.0], [work@theodorekisner.com], [healpix-autotools], [https://github.com/tskisner/healpix])
+AC_INIT([HEALPix], [3.30.1], [work@theodorekisner.com], [healpix-autotools], [https://github.com/tskisner/healpix])
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign tar-ustar])
 AC_CONFIG_HEADERS(config.h)
diff --git a/data/Makefile.am b/data/Makefile.am
index c60d17e..66e8c89 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
 
-healpixextradir = $(datadir)/@PACKAGE@
+healpixextradir = $(datadir)/healpix
 
 healpixextra_DATA = pixel_window_n0002.fits \
                     pixel_window_n0004.fits \
diff --git a/src/f90/test/Makefile.am b/src/f90/test/Makefile.am
index 29f1140..20bd5e5 100644
--- a/src/f90/test/Makefile.am
+++ b/src/f90/test/Makefile.am
@@ -1,4 +1,52 @@
 
+healpixtestdir = $(datadir)/healpix/test
+
+healpixtest_DATA = \
+runtest.sh \
+almdec.fits \
+alm.fits \
+alt.par \
+ana_cut.par \
+ana.par \
+cl.fits \
+cl_old.fits \
+cl_out.fits \
+cl_planck1.fits \
+cl_planck2.fits \
+cl_wmap1.fits \
+cl_wmap5.fits \
+cl_wmap7.fits \
+distmask.fits \
+distmask.gif \
+hot.par \
+map_ext.fits \
+map_ext.gif \
+map.fits \
+map.gif \
+map_LOres.fits \
+map_LOres.gif \
+map_mf.fits \
+map_mf.gif \
+map_ngfs.fits \
+map_ngfs.gif \
+map_sm.fits \
+map_sm.gif \
+mask.fits \
+mask.gif \
+max.asc \
+med.par \
+min.asc \
+ngfs.par \
+planck2013ext_lcdm_cl_v1.fits \
+planck2015_lcdm_cl_v2.fits \
+prmask.par \
+README \
+smo.par \
+syn.par \
+udg.par \
+wmap_lcdm_pl_model_yr1_v1.fits \
+wmap_lcdm_sz_lens_wmap5_cl_v3.fits \
+wmap_lcdm_sz_lens_wmap7_cl_v4.fits
 
 EXTRA_DIST = \
 almdec.fits \
diff --git a/src/idl/Makefile.am b/src/idl/Makefile.am
index 6591254..d668545 100644
--- a/src/idl/Makefile.am
+++ b/src/idl/Makefile.am
@@ -18,7 +18,7 @@ bin_SCRIPTS = hidl hidlde
 
 CLEANFILES = hidl hidlde
 
-idldir = $(datadir)/@PACKAGE@/idl
+idldir = $(datadir)/healpix/idl
 
 idl_DATA = \
 HEALPix_startup
@@ -27,22 +27,22 @@ HEALPix_startup
 hidlde : hidl
 
 hidl : $(srcdir)/hidl.in $(srcdir)/hidlde.in $(srcdir)/gen_launch.sh
-	@$(srcdir)/gen_launch.sh "$(prefix)" "$(bindir)" "$(datadir)/@PACKAGE@" "$(srcdir)"
+	@$(srcdir)/gen_launch.sh "$(prefix)" "$(bindir)" "$(datadir)/healpix" "$(srcdir)"
 
 
 # install / uninstall all the IDL files
 
 install-data-local:
-	@$(mkinstalldirs) $(DESTDIR)$(datadir)/@PACKAGE@/idl; \
-	cp -r $(srcdir)/examples $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
-	cp -r $(srcdir)/fits $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
-	cp -r $(srcdir)/interfaces $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
-	cp -r $(srcdir)/misc $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
-	cp -r $(srcdir)/toolkit $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
-	cp -r $(srcdir)/visu $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
-	cp -r $(srcdir)/zzz_external $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
-	chmod -R a=rX,u+w $(DESTDIR)$(datadir)/@PACKAGE@/idl
+	@$(mkinstalldirs) $(DESTDIR)$(datadir)/healpix/idl; \
+	cp -r $(srcdir)/examples $(DESTDIR)$(datadir)/healpix/idl/; \
+	cp -r $(srcdir)/fits $(DESTDIR)$(datadir)/healpix/idl/; \
+	cp -r $(srcdir)/interfaces $(DESTDIR)$(datadir)/healpix/idl/; \
+	cp -r $(srcdir)/misc $(DESTDIR)$(datadir)/healpix/idl/; \
+	cp -r $(srcdir)/toolkit $(DESTDIR)$(datadir)/healpix/idl/; \
+	cp -r $(srcdir)/visu $(DESTDIR)$(datadir)/healpix/idl/; \
+	cp -r $(srcdir)/zzz_external $(DESTDIR)$(datadir)/healpix/idl/; \
+	chmod -R a=rX,u+w $(DESTDIR)$(datadir)/healpix/idl
 
 uninstall-local:
-	@rm -rf $(DESTDIR)$(datadir)/@PACKAGE@/idl
+	@rm -rf $(DESTDIR)$(datadir)/healpix/idl