e8641a
diff --git a/doc/ant.txt b/doc/ant.txt
e8641a
index 06ba3f3..fc500c3 100644
e8641a
--- a/doc/ant.txt
e8641a
+++ b/doc/ant.txt
e8641a
@@ -22,7 +22,7 @@ Repository for it, ship it as another source and install it.
e8641a
 [source,spec]
e8641a
 -------------
e8641a
 BuildRequires: ant
e8641a
-BuildRequires: maven-local
e8641a
+BuildRequires: javapackages-local
e8641a
 ...
e8641a
 %build
e8641a
 ant test
e8641a
diff --git a/doc/core_java_packages.txt b/doc/core_java_packages.txt
e8641a
index 34e0728..2baf4b2 100644
e8641a
--- a/doc/core_java_packages.txt
e8641a
+++ b/doc/core_java_packages.txt
e8641a
@@ -51,9 +51,39 @@ non-zero epoch in order to keep version ordering correct.
e8641a
 =======
e8641a
 
e8641a
 
e8641a
+==== Java Packages Tools
e8641a
+
e8641a
+Java Packages Tools are packaged as severas binary RPM packages
e8641a
+
e8641a
+*`maven-local`*::
e8641a
+
e8641a
+    This package provides a complete environment which is required to
e8641a
+    build Java packages using Apache Maven build system.  This
e8641a
+    includes a default system version of Java Development Kit (JDK),
e8641a
+    Maven, a number of Maven plugins commonly used to build packages,
e8641a
+    various macros and utlilty tools.  `maven-local` is usually
e8641a
+    declared as build dependency of Maven packages.
e8641a
+
e8641a
+*`ivy-local`*::
e8641a
+
e8641a
+    Analogously to `maven-local`, this package provides an environment
e8641a
+    required to build Java packages using Apache Ivy as dependency
e8641a
+    manager.
e8641a
+
e8641a
+*`javapackages-local`*::
e8641a
+
e8641a
+    Package providing a basic environment necessary to geterate and
e8641a
+    install metadata for system artifact repository.
e8641a
+
e8641a
+*`javapackages-tools`*::
e8641a
+
e8641a
+    Package owning basic Java directories and providing runtime
e8641a
+    support for Java packages.  The great majority of Java packages
e8641a
+    depend on `javapackages-tools`.
e8641a
+
e8641a
+
e8641a
 TODO
e8641a
 
e8641a
-* Java Packages Tools
e8641a
 * Ant
e8641a
 ** extra tasks and /etc/ant.d
e8641a
 * Maven
e8641a
diff --git a/doc/directory_layout.txt b/doc/directory_layout.txt
e8641a
index 862ccd4..907777d 100644
e8641a
--- a/doc/directory_layout.txt
e8641a
+++ b/doc/directory_layout.txt
e8641a
@@ -34,13 +34,6 @@ short description.
e8641a
     Maven are installed.  Each POM must have name that strictly
e8641a
     corresponds to JAR file in `%{_javadir}` or `%{_jnidir}`.
e8641a
 
e8641a
-*`%{_mavendepmapfragdir}`* -- `/usr/share/maven-fragments`::
e8641a
-
e8641a
-    Directory containing package metadata in XML format.  Typically
e8641a
-    each binary package installs there a single XML file containing
e8641a
-    various information (metadata) about artifacts associated with
e8641a
-    that package.
e8641a
-
e8641a
 
e8641a
 .Other directories
e8641a
 [glossary]
e8641a
diff --git a/doc/generic_java_build.txt b/doc/generic_java_build.txt
e8641a
index 6fb09bb..5c29c95 100644
e8641a
--- a/doc/generic_java_build.txt
e8641a
+++ b/doc/generic_java_build.txt
e8641a
@@ -11,49 +11,18 @@ POM or JAR file, we may use the `%add_maven_depmap` macro. However, if package
e8641a
 is build in standard way (i.e.: `%mvn_build` and `%mvn_install`), then calling
e8641a
 `%add_maven_depmap` is neither needed nor recommended.  This macro is usually
e8641a
 useful only for packages that use other build tool than Maven (e.g.: ant,
e8641a
-gradle).  It creates files in `%{_mavendepmapfragdir}` that map
e8641a
-groupId:artifactId pairs to JAR files under `%{_javadir}`. These files are
e8641a
-called depmap fragments. The macro can read the groupId and artifactId from the
e8641a
-POM file or maintainer can pass this information as an argument.  All fragments
e8641a
-in `%{_mavendepmapfragdir}` directory are read by XMvn, allowing the
e8641a
-locally installed JAR and POM files to be used as a maven repository.
e8641a
-
e8641a
-Note that -- unless you use the `-f` option as shown below -- all
e8641a
-depmap fragments for a given package are written to the same file,
e8641a
-`%{_mavendepmapfragdir}/%{name}`. You should be sure to include this
e8641a
-file in the `%files` section of your RPM.
e8641a
+gradle).
e8641a
 
e8641a
 For the macro to work properly, all JAR files must be copied into `%{_javadir}`
e8641a
-and all POM files must be copied into `%{_mavenpomdir}` and given file names of
e8641a
-the following form, where `jarname` is the name of the JAR without the .jar
e8641a
-suffix:
e8641a
+and all POM files must be copied into `%{_mavenpomdir}`.
e8641a
 
e8641a
-[source,spec]
e8641a
---------
e8641a
-%{_mavenpomdir}/JPP[.subdirectory]-jarname.pom
e8641a
---------
e8641a
-
e8641a
-Note that the subdirectory is only necessary if the JAR file is put into a
e8641a
-subdirectory of `%{_javadir}`. For example:
e8641a
-
e8641a
-* For junit, the JAR is `%{_javadir}/junit.jar`, so the POM would be
e8641a
-  `%{_mavenpomdir}/JPP-junit.pom`.
e8641a
-* For plexus-ant-factory, the JAR is `%{_javadir}/plexus/ant-factory.jar`, so
e8641a
-  the POM would named `%{_mavenpomdir}/JPP.plexus-ant-factory.pom`.
e8641a
-
e8641a
-If a POM is installed with no corresponding JAR file -- for example, for parent
e8641a
-POM files -- the same convention should be followed:
e8641a
-
e8641a
-* The Apache commons parent POM is installed in
e8641a
-  `%{_mavenpomdir}/JPP-commons-parent.pom`.
e8641a
-
e8641a
-In its simplest form (a POM without a JAR file), `%add_maven_depmap` looks like
e8641a
+In simplest form (a POM without a JAR file), `%add_maven_depmap` looks like
e8641a
 this:
e8641a
 
e8641a
 .Parent POM
e8641a
 [source,spec]
e8641a
 --------
e8641a
-%add_maven_depmap JPP-%{name}.pom
e8641a
+%add_maven_depmap %{name}.pom
e8641a
 --------
e8641a
 
e8641a
 This will read the POM file in question and provide a mapping between the
e8641a
@@ -65,7 +34,7 @@ For a POM that maps directly to a JAR file, the following is the correct form:
e8641a
 .Standard invocation
e8641a
 [source,spec]
e8641a
 --------
e8641a
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
e8641a
+%add_maven_depmap %{name}.pom %{name}.jar
e8641a
 --------
e8641a
 
e8641a
 In addition to creating the POM mapping, this will also ensure that the correct
e8641a
@@ -82,7 +51,7 @@ mapping between Maven artifact and corresponding JAR file:
e8641a
 .Providing additional artifact mappings
e8641a
 [source,spec]
e8641a
 --------
e8641a
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:commons-lang"
e8641a
+%add_maven_depmap %{name}.pom %{name}.jar -a "org.apache.commons:commons-lang"
e8641a
 --------
e8641a
 This form also adds additional mappings for given POM/JAR file. For example, if
e8641a
 the POM file indicates that it contains groupId commons-lang, artifactId
e8641a
@@ -94,16 +63,16 @@ require different IDs than those reflected in the installed POM.
e8641a
 .Multiple subpackages
e8641a
 [source,spec]
e8641a
 --------
e8641a
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -f "XXX"
e8641a
+%add_maven_depmap %{name}.pom %{name}.jar -f "XXX"
e8641a
 --------
e8641a
-This form stores dependency mapping inside `%{_mavendepmapfragdir}/%{name}-XXX`
e8641a
-instead of standard location. This is useful for packages with multiple
e8641a
-subpackages where each has its own JAR files.
e8641a
+This form stores metadata information in file with suffix "XXX".  This
e8641a
+is useful for packages with multiple subpackages where each has its own
e8641a
+JAR files.
e8641a
 
e8641a
 .Multiple artifacts in a subdirectory
e8641a
 [source,spec]
e8641a
 --------
e8641a
-%add_maven_depmap JPP.%{name}-sub.pom %{name}/sub.jar
e8641a
+%add_maven_depmap %{name}-sub.pom %{name}/sub.jar
e8641a
 --------
e8641a
 
e8641a
 This form should be used when a package consists of multiple JAR files that are
e8641a
diff --git a/doc/index.txt b/doc/index.txt
e8641a
index f9af27e..22c9ab2 100644
e8641a
--- a/doc/index.txt
e8641a
+++ b/doc/index.txt
e8641a
@@ -63,22 +63,6 @@ References
e8641a
   'DocBook - The Definitive Guide'. O'Reilly & Associates. 1999.
e8641a
   ISBN 1-56592-580-7.
e8641a
 
e8641a
-
e8641a
-[glossary]
e8641a
-Glossary
e8641a
---------
e8641a
-Glossaries are optional. Glossaries entries are an example of a style
e8641a
-of AsciiDoc labeled lists.
e8641a
-
e8641a
-[glossary]
e8641a
-[[Xdepmap]]depmap::
e8641a
-  Depmap is a special file telling Maven relationships between
e8641a
-  groupId,artifactId and JAR file on the filesystem
e8641a
-
e8641a
-A second glossary term::
e8641a
-  The corresponding (indented) definition.
e8641a
-
e8641a
-
e8641a
 ifdef::backend-docbook[]
e8641a
 [index]
e8641a
 Example Index
e8641a
diff --git a/doc/maven.txt b/doc/maven.txt
e8641a
index 7539d00..63c8cc8 100644
e8641a
--- a/doc/maven.txt
e8641a
+++ b/doc/maven.txt
e8641a
@@ -35,7 +35,7 @@ BuildRequires:  maven-local
e8641a
 
e8641a
 The macros `%mvn_build` and `%mvn_install` automatically handle building of the
e8641a
 JAR files and their subsequent installation to the correct directory. The
e8641a
-corresponding POM and <<xdepmap,depmap>> files are also installed.
e8641a
+corresponding POM and metadata files are also installed.
e8641a
 
e8641a
 [[packaging_maven_project]]
e8641a
 === Packaging Maven project
e8641a
diff --git a/doc/mvn_macros.txt b/doc/mvn_macros.txt
e8641a
index c1b9aa2..1115cc8 100644
e8641a
--- a/doc/mvn_macros.txt
e8641a
+++ b/doc/mvn_macros.txt
e8641a
@@ -66,7 +66,7 @@ If the project consists of multiple artifacts, it is recommended to install each
e8641a
 artifact to the separate subpackage. The macro `%mvn_build -s` will generate
e8641a
 separate `.mfiles` file for every artifact in the project. This file contains
e8641a
 list of files related to specific artifact (typically JAR file, POM file and
e8641a
-depmap). It can be later used in `%files` section of the spec file.
e8641a
+metadata). It can be later used in `%files` section of the spec file.
e8641a
 
e8641a
 .Creating one subpackage for each generated artifact
e8641a
 [source,spec]