diff --git a/META b/META
index 11542c5..46c21ab 100644
--- a/META
+++ b/META
@@ -1,3 +1,3 @@
-Name:    ior
+Package: ior
 Version: 2.999.3
 Release: 0
diff --git a/Makefile.am b/Makefile.am
index d409b68..685d716 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = src doc contrib
-EXTRA_DIST = COPYRIGHT README ChangeLog
+EXTRA_DIST = META COPYRIGHT README ChangeLog
diff --git a/configure.ac b/configure.ac
index d37fb2d..55022fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_CONFIG_HEADER([src/config.h])
 AC_CANONICAL_HOST
 
 # Automake support
-AM_INIT_AUTOMAKE([$PACKAGE], [$VERSION], [check-news dist-bzip2 gnu no-define])
+AM_INIT_AUTOMAKE([$META_NAME], [$META_VERSION], [check-news dist-bzip2 gnu no-define])
 AM_MAINTAINER_MODE
 
 # Checks for programs.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 78926d0..a783220 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1 @@
-data_DATA = USER_GUIDE
+dist_data_DATA = USER_GUIDE