3 files changed, 107 insertions, 0 deletions
diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md
index 8e8f3b4ed7e..aaed7fbb64e 100644
--- a/CHANGELOG-3.6.md
+++ b/CHANGELOG-3.6.md
@@ -30,6 +30,11 @@ particular aspect of Ice.
 
 These are the changes since Ice 3.6.1.
 
+## General Changes
+
+- Added two new tools, icegriddb36 and icestormdb36, used to import/export the
+  IceGrid and IceStorm databases.
+
 ## C++ Changes
 
 - Fixed El Capitan build issues caused by a new security feature that no longer
diff --git a/man/man1/icegriddb36.1 b/man/man1/icegriddb36.1
new file mode 100644
index 00000000000..dc7ff332d6e
--- /dev/null
+++ b/man/man1/icegriddb36.1
@@ -0,0 +1,52 @@
+.TH icegriddb36 1
+
+.SH NAME
+
+icegriddb36 - The IceGrid database import/export utility.
+
+.SH SYNOPSIS
+
+icegriddb36 [options]
+
+.SH DESCRIPTION
+
+The icegriddb36 utility is a command-line tool for importing and exporting IceGrid
+databases.
+
+.SH OPTIONS
+
+.TP
+.BR \-h ", " \-\-help\fR
+.br
+Show program help.
+
+.TP
+.BR \-v ", " \-\-version\fR
+.br
+Display the Ice version.
+
+.TP
+.BR \-d ", " \-\-debug\fR
+.br
+Print debug messages.
+
+.TP
+.BR \-\-import " " FILE\fR
+.br
+Import database from specifed file.
+
+.TP
+.BR \-\-export " " FILE\fR
+.br
+Export database to specified file.
+
+.TP
+.BR \-\-dbhome " " DIR\fR
+.br
+The database directory.
+
+.SH SEE ALSO
+
+.BR icegridadmin (1),
+.BR icegridnode (1),
+.BR icegridregistry (1)
diff --git a/man/man1/icestormdb36.1 b/man/man1/icestormdb36.1
new file mode 100644
index 00000000000..b28fb864b28
--- /dev/null
+++ b/man/man1/icestormdb36.1
@@ -0,0 +1,50 @@
+.TH icestormdb36 1
+
+.SH NAME
+
+icestormdb36 - The IceStorm database import/export utility.
+
+.SH SYNOPSIS
+
+icestormb [options]
+
+.SH DESCRIPTION
+
+The icestormdb36 utility is a command-line tool for importing and exporting IceStorm
+databases.
+
+.SH OPTIONS
+
+.TP
+.BR \-h ", " \-\-help\fR
+.br
+Show program help.
+
+.TP
+.BR \-v ", " \-\-version\fR
+.br
+Display the Ice version.
+
+.TP
+.BR \-d ", " \-\-debug\fR
+.br
+Print debug messages.
+
+.TP
+.BR \-\-import " " FILE\fR
+.br
+Import database from specifed file.
+
+.TP
+.BR \-\-export " " FILE\fR
+.br
+Export database to specified file.
+
+.TP
+.BR \-\-dbhome " " DIR\fR
+.br
+The database directory.
+
+.SH SEE ALSO
+
+.BR icestormadmin (1)