diff --git a/.gitignore b/.gitignore
index d465d80..2788c18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /ast-7.3.2.tar.gz
 /ast-7.3.3.tar.gz
 /ast-7.3.4.tar.gz
+/ast-8.0.0.tar.gz
diff --git a/ast-bundled.patch b/ast-bundled.patch
new file mode 100644
index 0000000..9275a14
--- /dev/null
+++ b/ast-bundled.patch
@@ -0,0 +1,196 @@
+diff -up ast-8.0.0/Makefile.in.cminpack ast-8.0.0/Makefile.in
+--- ast-8.0.0/Makefile.in.cminpack	2014-05-13 10:00:51.931505129 -0600
++++ ast-8.0.0/Makefile.in	2014-05-13 10:02:44.988868441 -0600
+@@ -215,10 +215,6 @@ am__objects_1 = libast_la-axis.lo libast
+ am__objects_2 =
+ am__objects_3 = $(am__objects_2)
+ am__dirstamp = $(am__leading_dot)dirstamp
+-am__objects_4 = cminpack/libast_la-lmder1.lo \
+-	cminpack/libast_la-lmder.lo cminpack/libast_la-dpmpar.lo \
+-	cminpack/libast_la-enorm.lo cminpack/libast_la-qrfac.lo \
+-	cminpack/libast_la-lmpar.lo cminpack/libast_la-qrsolv.lo
+ am__objects_5 = libast_la-proj.lo libast_la-tpn.lo \
+ 	libast_la-wcstrig.lo
+ am_libast_la_OBJECTS = $(am__objects_1) $(am__objects_3) \
+@@ -1268,17 +1264,6 @@ PAL_FILES = \
+     erfa.h \
+     erfam.h
+ 
+-CMINPACK_FILES = \
+-    cminpack/cminpack.h \
+-    cminpack/cminpackP.h \
+-    cminpack/lmder1.c \
+-    cminpack/lmder.c \
+-    cminpack/dpmpar.c \
+-    cminpack/enorm.c \
+-    cminpack/qrfac.c \
+-    cminpack/lmpar.c \
+-    cminpack/qrsolv.c
+-
+ bin_SCRIPTS = ast_link
+ dist_bin_SCRIPTS = ast_link_adam
+ noinst_SCRIPTS = ast_cpp
+@@ -1343,13 +1328,13 @@ libast_la_SOURCES = \
+     $(WCSLIB_FILES) \
+     ast_err.h
+ 
+-@EXTERNAL_PAL_FALSE@libast_la_LIBADD = libast_pal.la
++@EXTERNAL_PAL_FALSE@libast_la_LIBADD = libast_pal.la -lcminpack -lerfa
+ 
+ # Ensure libast links against libraries containing functions used within
+ # libast. If AST is configured --with-external-pal, then the internal
+ # libast_pal library will be empty, and we link to an external PAL
+ # library instead.
+-@EXTERNAL_PAL_TRUE@libast_la_LIBADD = $(libdir)/libpal.la
++@EXTERNAL_PAL_TRUE@libast_la_LIBADD = $(libdir)/libpal.la -lcminpack -lerfa
+ 
+ # AST_PAR is really part of GRP_F_INCLUDE_FILES, but it must not be
+ # distributed, so list it separately.
+@@ -1404,7 +1389,7 @@ astbad_SOURCES = astbad.c pointset.h
+ # configure.ac, and so is not distributed automatically.
+ #
+ # makeh is required in order to build ast.h after distribution (see below).
+-EXTRA_DIST = ast_par.source sun210_figures sun211_figures pal erfa cminpack
++EXTRA_DIST = ast_par.source sun210_figures sun211_figures pal erfa
+ 
+ # AST_ERR and ast_err.h are `generated source files', and so must be
+ # generated before any other compilations are done.  Note that these
+@@ -1556,26 +1541,6 @@ clean-libLTLIBRARIES:
+ 	  echo rm -f $${locs}; \
+ 	  rm -f $${locs}; \
+ 	}
+-cminpack/$(am__dirstamp):
+-	@$(MKDIR_P) cminpack
+-	@: > cminpack/$(am__dirstamp)
+-cminpack/$(DEPDIR)/$(am__dirstamp):
+-	@$(MKDIR_P) cminpack/$(DEPDIR)
+-	@: > cminpack/$(DEPDIR)/$(am__dirstamp)
+-cminpack/libast_la-lmder1.lo: cminpack/$(am__dirstamp) \
+-	cminpack/$(DEPDIR)/$(am__dirstamp)
+-cminpack/libast_la-lmder.lo: cminpack/$(am__dirstamp) \
+-	cminpack/$(DEPDIR)/$(am__dirstamp)
+-cminpack/libast_la-dpmpar.lo: cminpack/$(am__dirstamp) \
+-	cminpack/$(DEPDIR)/$(am__dirstamp)
+-cminpack/libast_la-enorm.lo: cminpack/$(am__dirstamp) \
+-	cminpack/$(DEPDIR)/$(am__dirstamp)
+-cminpack/libast_la-qrfac.lo: cminpack/$(am__dirstamp) \
+-	cminpack/$(DEPDIR)/$(am__dirstamp)
+-cminpack/libast_la-lmpar.lo: cminpack/$(am__dirstamp) \
+-	cminpack/$(DEPDIR)/$(am__dirstamp)
+-cminpack/libast_la-qrsolv.lo: cminpack/$(am__dirstamp) \
+-	cminpack/$(DEPDIR)/$(am__dirstamp)
+ libast.la: $(libast_la_OBJECTS) $(libast_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(libast_la_LINK) -rpath $(libdir) $(libast_la_LDFLAGS) $(libast_la_OBJECTS) $(libast_la_LIBADD)  $(LIBS)
+ libast_drama.la: $(libast_drama_la_OBJECTS) $(libast_drama_la_DEPENDENCIES) 
+@@ -1703,8 +1668,6 @@ uninstall-dist_binSCRIPTS:
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+-	-rm -f cminpack/*.$(OBJEXT)
+-	-rm -f cminpack/*.lo
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+@@ -1853,13 +1816,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libast_pal_la-pal.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libast_pgplot3d_la-grf3d_pgplot.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libast_pgplot_la-grf_pgplot.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-dpmpar.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-enorm.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-lmder.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-lmder1.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-lmpar.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-qrfac.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@cminpack/$(DEPDIR)/libast_la-qrsolv.Plo@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@@ -2788,55 +2744,6 @@ libast_la-zoommap.lo: zoommap.c
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -c -o libast_la-zoommap.lo `test -f 'zoommap.c' || echo '$(srcdir)/'`zoommap.c
+ 
+-cminpack/libast_la-lmder1.lo: cminpack/lmder1.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -MT cminpack/libast_la-lmder1.lo -MD -MP -MF cminpack/$(DEPDIR)/libast_la-lmder1.Tpo -c -o cminpack/libast_la-lmder1.lo `test -f 'cminpack/lmder1.c' || echo '$(srcdir)/'`cminpack/lmder1.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cminpack/$(DEPDIR)/libast_la-lmder1.Tpo cminpack/$(DEPDIR)/libast_la-lmder1.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cminpack/lmder1.c' object='cminpack/libast_la-lmder1.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -c -o cminpack/libast_la-lmder1.lo `test -f 'cminpack/lmder1.c' || echo '$(srcdir)/'`cminpack/lmder1.c
+-
+-cminpack/libast_la-lmder.lo: cminpack/lmder.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -MT cminpack/libast_la-lmder.lo -MD -MP -MF cminpack/$(DEPDIR)/libast_la-lmder.Tpo -c -o cminpack/libast_la-lmder.lo `test -f 'cminpack/lmder.c' || echo '$(srcdir)/'`cminpack/lmder.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cminpack/$(DEPDIR)/libast_la-lmder.Tpo cminpack/$(DEPDIR)/libast_la-lmder.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cminpack/lmder.c' object='cminpack/libast_la-lmder.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -c -o cminpack/libast_la-lmder.lo `test -f 'cminpack/lmder.c' || echo '$(srcdir)/'`cminpack/lmder.c
+-
+-cminpack/libast_la-dpmpar.lo: cminpack/dpmpar.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -MT cminpack/libast_la-dpmpar.lo -MD -MP -MF cminpack/$(DEPDIR)/libast_la-dpmpar.Tpo -c -o cminpack/libast_la-dpmpar.lo `test -f 'cminpack/dpmpar.c' || echo '$(srcdir)/'`cminpack/dpmpar.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cminpack/$(DEPDIR)/libast_la-dpmpar.Tpo cminpack/$(DEPDIR)/libast_la-dpmpar.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cminpack/dpmpar.c' object='cminpack/libast_la-dpmpar.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -c -o cminpack/libast_la-dpmpar.lo `test -f 'cminpack/dpmpar.c' || echo '$(srcdir)/'`cminpack/dpmpar.c
+-
+-cminpack/libast_la-enorm.lo: cminpack/enorm.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -MT cminpack/libast_la-enorm.lo -MD -MP -MF cminpack/$(DEPDIR)/libast_la-enorm.Tpo -c -o cminpack/libast_la-enorm.lo `test -f 'cminpack/enorm.c' || echo '$(srcdir)/'`cminpack/enorm.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cminpack/$(DEPDIR)/libast_la-enorm.Tpo cminpack/$(DEPDIR)/libast_la-enorm.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cminpack/enorm.c' object='cminpack/libast_la-enorm.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -c -o cminpack/libast_la-enorm.lo `test -f 'cminpack/enorm.c' || echo '$(srcdir)/'`cminpack/enorm.c
+-
+-cminpack/libast_la-qrfac.lo: cminpack/qrfac.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -MT cminpack/libast_la-qrfac.lo -MD -MP -MF cminpack/$(DEPDIR)/libast_la-qrfac.Tpo -c -o cminpack/libast_la-qrfac.lo `test -f 'cminpack/qrfac.c' || echo '$(srcdir)/'`cminpack/qrfac.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cminpack/$(DEPDIR)/libast_la-qrfac.Tpo cminpack/$(DEPDIR)/libast_la-qrfac.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cminpack/qrfac.c' object='cminpack/libast_la-qrfac.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -c -o cminpack/libast_la-qrfac.lo `test -f 'cminpack/qrfac.c' || echo '$(srcdir)/'`cminpack/qrfac.c
+-
+-cminpack/libast_la-lmpar.lo: cminpack/lmpar.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -MT cminpack/libast_la-lmpar.lo -MD -MP -MF cminpack/$(DEPDIR)/libast_la-lmpar.Tpo -c -o cminpack/libast_la-lmpar.lo `test -f 'cminpack/lmpar.c' || echo '$(srcdir)/'`cminpack/lmpar.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cminpack/$(DEPDIR)/libast_la-lmpar.Tpo cminpack/$(DEPDIR)/libast_la-lmpar.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cminpack/lmpar.c' object='cminpack/libast_la-lmpar.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -c -o cminpack/libast_la-lmpar.lo `test -f 'cminpack/lmpar.c' || echo '$(srcdir)/'`cminpack/lmpar.c
+-
+-cminpack/libast_la-qrsolv.lo: cminpack/qrsolv.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -MT cminpack/libast_la-qrsolv.lo -MD -MP -MF cminpack/$(DEPDIR)/libast_la-qrsolv.Tpo -c -o cminpack/libast_la-qrsolv.lo `test -f 'cminpack/qrsolv.c' || echo '$(srcdir)/'`cminpack/qrsolv.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) cminpack/$(DEPDIR)/libast_la-qrsolv.Tpo cminpack/$(DEPDIR)/libast_la-qrsolv.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cminpack/qrsolv.c' object='cminpack/libast_la-qrsolv.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -c -o cminpack/libast_la-qrsolv.lo `test -f 'cminpack/qrsolv.c' || echo '$(srcdir)/'`cminpack/qrsolv.c
+-
+ libast_la-proj.lo: proj.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -MT libast_la-proj.lo -MD -MP -MF $(DEPDIR)/libast_la-proj.Tpo -c -o libast_la-proj.lo `test -f 'proj.c' || echo '$(srcdir)/'`proj.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libast_la-proj.Tpo $(DEPDIR)/libast_la-proj.Plo
+@@ -2933,7 +2840,6 @@ mostlyclean-libtool:
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+-	-rm -rf cminpack/.libs cminpack/_libs
+ 
+ distclean-libtool:
+ 	-rm -f libtool config.lt
+@@ -3642,8 +3548,6 @@ clean-generic:
+ distclean-generic:
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+-	-rm -f cminpack/$(DEPDIR)/$(am__dirstamp)
+-	-rm -f cminpack/$(am__dirstamp)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -3663,7 +3567,6 @@ clean-am: clean-checkPROGRAMS clean-gene
+ 
+ distclean: distclean-am
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+-	-rm -rf ./$(DEPDIR) cminpack/$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+ 	distclean-hdr distclean-libtool distclean-tags
+@@ -3716,7 +3619,6 @@ installcheck-am:
+ maintainer-clean: maintainer-clean-am
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ 	-rm -rf $(top_srcdir)/autom4te.cache
+-	-rm -rf ./$(DEPDIR) cminpack/$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
diff --git a/ast.spec b/ast.spec
index e2d9db6..f92a834 100644
--- a/ast.spec
+++ b/ast.spec
@@ -1,19 +1,23 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:           ast
-Version:        7.3.4
+Version:        8.0.0
 Release:        1%{?dist}
 Summary:        A Library for Handling World Coordinate Systems in Astronomy
 
 Group:          System Environment/Libraries
 # proj.c proj.h wcsmath.h wcstrig.c wcstrig.h are LGPLv2+
-License:        GPLv2+ and LGPLv2+
+License:        LGPLv3+ and LGPLv2+
 URL:            http://starlink.jach.hawaii.edu/starlink/AST
 Source0:        http://www.starlink.ac.uk/download/ast/ast-%{version}.tar.gz
 # Fix up library linkages
 Patch0:         ast-libs.patch
+# Remove bundled cminpack and erfa
+Patch1:         ast-bundled.patch
 
 BuildRequires:  gcc-gfortran
+BuildRequires:  cminpack-devel
+BuildRequires:  erfa-devel
 
 %description
 The AST library provides a comprehensive range of facilities for attaching
@@ -67,6 +71,10 @@ C and Fortran programming documentation for %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .libs
+%patch1 -p1 -b .bundled
+rm -r cminpack erfa erfa.h erfam.h
+sed -i -e '/include.*erfa/d' pal.c
+sed -i -e 's,cminpack/,cminpack-1/,' polymap.c
 sed -i -e '1i#!/bin/bash' ast_link*
 # Fix FSF address
 sed -i -e 's/675 Mass Ave, Cambridge, MA 02139/51 Franklin Street, Fifth Floor, Boston, MA  02110-1301/' COPYING.LIB proj.* wcstrig.*
@@ -106,7 +114,7 @@ make check
 
 
 %files
-%doc COPYING.LIB LICENCE
+%doc COPYING*
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}_%{_arch}.conf
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so.*
@@ -121,6 +129,9 @@ make check
 
 
 %changelog
+* Tue May 13 2014 Orion Poplawski <orion@cora.nwra.com> 8.0.0-1
+- Update to 8.0.0
+
 * Fri Mar 7 2014 Orion Poplawski <orion@cora.nwra.com> 7.3.4-1
 - Update to 7.3.4
 
diff --git a/sources b/sources
index 7c75be2..0484148 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-719c15bbe9cb5a3bb94c1e49ae23757b  ast-7.3.4.tar.gz
+3c5158ee53c51bba0bef256de12bdeb9  ast-8.0.0.tar.gz