diff -Nurd grib_api-1.21.0-Source.orig/Makefile.in grib_api-1.21.0-Source/Makefile.in
--- grib_api-1.21.0-Source.orig/Makefile.in	2017-03-15 11:46:21.000000000 +0100
+++ grib_api-1.21.0-Source/Makefile.in	2017-05-08 17:09:00.000000000 +0200
@@ -87,7 +87,7 @@
 	$(top_srcdir)/rpms/grib_api_f90.pc.in \
 	$(top_srcdir)/perl/GRIB-API/Makefile.PL.in COPYING \
 	config/config.guess config/config.sub config/depcomp \
-	config/install-sh config/missing config/ltmain.sh \
+	config/install-sh config/ltmain.sh \
 	$(top_srcdir)/config/config.guess \
 	$(top_srcdir)/config/config.sub \
 	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
diff -Nurd grib_api-1.21.0-Source.orig/config/ltmain.sh grib_api-1.21.0-Source/config/ltmain.sh
--- grib_api-1.21.0-Source.orig/config/ltmain.sh	2017-03-15 11:46:19.000000000 +0100
+++ grib_api-1.21.0-Source/config/ltmain.sh	2017-05-08 17:09:00.000000000 +0200
@@ -7399,13 +7399,13 @@
 	  # Like Linux, but with the current version available in
 	  # verstring for coding it into the library header
 	  func_arith $current - $age
-	  major=.$func_arith_result
+	  major=.1
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  func_arith $current + 1
 	  minor_current=$func_arith_result
 	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  verstring="-compatibility_version 1.9.0 -current_version 1.21.0"
 	  ;;
 
 	freebsd-aout)
diff -Nurd grib_api-1.21.0-Source.orig/configure grib_api-1.21.0-Source/configure
--- grib_api-1.21.0-Source.orig/configure	2017-03-15 11:46:21.000000000 +0100
+++ grib_api-1.21.0-Source/configure	2017-05-08 17:09:00.000000000 +0200
@@ -588,10 +588,10 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='grib_api'
-PACKAGE_TARNAME='grib_api'
+PACKAGE_NAME='grib-api'
+PACKAGE_TARNAME='grib-api'
 PACKAGE_VERSION=' '
-PACKAGE_STRING='grib_api  '
+PACKAGE_STRING='grib-api  '
 PACKAGE_BUGREPORT='Software.Support@ecmwf.int'
 PACKAGE_URL=''
 
@@ -6754,7 +6754,7 @@
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
+	10.[012],.*)
 	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
 	10.*)
 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
@@ -11777,9 +11777,9 @@
 
 
 
-definition_files_path="${datadir}/grib_api/definitions"
-samples_files_path="${datadir}/grib_api/samples"
-ifs_samples_files_path="${datadir}/grib_api/ifs_samples"
+definition_files_path="${datadir}/${PACKAGE}/definitions"
+samples_files_path="${datadir}/${PACKAGE}/samples"
+ifs_samples_files_path="${datadir}/${PACKAGE}/ifs_samples"
 default_perl_install="${prefix}/perl"
 
 
diff -Nurd grib_api-1.21.0-Source.orig/fortran/Makefile.in grib_api-1.21.0-Source/fortran/Makefile.in
--- grib_api-1.21.0-Source.orig/fortran/Makefile.in	2017-03-15 11:46:22.000000000 +0100
+++ grib_api-1.21.0-Source/fortran/Makefile.in	2017-05-08 17:09:00.000000000 +0200
@@ -288,7 +288,7 @@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -lgrib_api
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIB_AEC = @LIB_AEC@
@@ -414,10 +414,10 @@
 lib_LTLIBRARIES = libgrib_api_f77.la libgrib_api_f90.la
 include_HEADERS = grib_api_f77.h
 libgrib_api_f77_la_SOURCES = grib_fortran.c grib_f77.c 
-libgrib_api_f77_la_DEPENDENCIES = $(top_builddir)/src/libgrib_api.la
+libgrib_api_f77_la_DEPENDENCIES = 
 libgrib_api_f77_la_LDFLAGS = -version-info $(GRIB_ABI_CURRENT):$(GRIB_ABI_REVISION):$(GRIB_ABI_AGE)
 libgrib_api_f90_la_SOURCES = grib_fortran.c grib_f90.f90 
-libgrib_api_f90_la_DEPENDENCIES = $(top_builddir)/src/libgrib_api.la grib_api_externals.h grib_api_visibility.h grib_api_constants.h grib_kinds.h
+libgrib_api_f90_la_DEPENDENCIES = grib_api_externals.h grib_api_visibility.h grib_api_constants.h grib_kinds.h
 libgrib_api_f90_la_LDFLAGS = -version-info $(GRIB_ABI_CURRENT):$(GRIB_ABI_REVISION):$(GRIB_ABI_AGE)
 libgrib_api_fortran_prototypes = grib_fortran.c
 @UPPER_CASE_MOD_FALSE@nodist_include_HEADERS = grib_api.mod
diff -Nurd grib_api-1.21.0-Source.orig/tests/Makefile.in grib_api-1.21.0-Source/tests/Makefile.in
--- grib_api-1.21.0-Source.orig/tests/Makefile.in	2017-03-15 11:46:22.000000000 +0100
+++ grib_api-1.21.0-Source/tests/Makefile.in	2017-05-08 17:09:00.000000000 +0200
@@ -1599,7 +1599,6 @@
 
 # First download all the necessary data for testing
 # Note: if download fails, no tests will be done
-$(TESTS): download_data
 download_data:
 	@$(top_srcdir)/data/download.sh $(top_srcdir)/data
 
diff -Nurd grib_api-1.21.0-Source.orig/version.sh grib_api-1.21.0-Source/version.sh
--- grib_api-1.21.0-Source.orig/version.sh	2017-03-14 17:37:35.000000000 +0100
+++ grib_api-1.21.0-Source/version.sh	2017-05-08 17:09:00.000000000 +0200
@@ -10,7 +10,7 @@
 #
 #
 # Package base name
-PACKAGE_NAME='grib_api'
+PACKAGE_NAME='grib-api'
 
 # Package version
 GRIB_API_MAJOR_VERSION=1