12 files changed, 224 insertions, 2 deletions

diff --git a/TODO b/TODO
index 65034a0..03960c4 100644
--- a/TODO
+++ b/TODO
@@ -131,12 +131,13 @@ ModifyNetworkInterfaceAttribute    -                          [ ]        [ ]
 ModifySnapshotAttribute            setsattr                   [X]        [X]
 ModifySubnetAttribute              setsubnetattr              [X]        [ ]
 ModifyVolume                       chvol                      [X]        [X]
 ModifyVolumeAttribute              -                          [ ]        [ ]
 ModifyVpcAttribute                 setvpcattr                 [X]        [ ]
 MonitorInstances                   -                          [ ]        [ ]
+MoveAddressToVpc                   addr2vpc                   [X]        [X]
 PurchaseReservedInstancesOffering  -                          [ ]        [ ]
 RebootInstances                    reboot                     [X]        [X]
 RegisterImage                      -                          [ ]        [ ]
 ReleaseAddress                     rmaddr                     [X]        [X]
 ReplaceNetworkAclAssociation       -                          [ ]        [ ]
 ReplaceNetworkAclEntry             -                          [ ]        [ ]
@@ -145,12 +146,13 @@ ReplaceRouteTableAssociation       -                          [ ]        [ ]
 ReportInstanceStatus               -                          [ ]        [ ]
 RequestSpotInstances               -                          [ ]        [ ]
 ResetImageAttribute                -                          [ ]        [ ]
 ResetInstanceAttribute             -                          [ ]        [ ]
 ResetNetworkInterfaceAttribute     -                          [ ]        [ ]
 ResetSnapshotAttribute             clrsattr                   [X]        [X]
+RestoreAddressToClassic            addr2ec2                   [X]        [X]
 RevokeSecurityGroupEgress          sg                         [X]        [X]
 RevokeSecurityGroupIngress         sg                         [X]        [X]
 RunInstances                       mkinst                     [X]        [X]
 StartInstances                     start                      [X]        [X]
 StopInstances                      stop                       [X]        [X]
 TerminateInstances                 terminate                  [X]        [X]
diff --git a/doc/Makefile.inc b/doc/Makefile.inc
index e55c607..ab6c2a7 100644
--- a/doc/Makefile.inc
+++ b/doc/Makefile.inc
@@ -1,8 +1,8 @@
 # This file is part of Eclat -*- Makefile -*-
-# Copyright (C) 2012-2018 Sergey Poznyakoff
+# Copyright (C) 2012-2019 Sergey Poznyakoff
 #
 # Eclat is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
@@ -17,12 +17,14 @@
 # This file contains the lists of manual pages to be installed.  They
 # are kept separately so they may be included from another makefiles.
 # Currently they are used in the Makefile.am and in the webdoc Makefile.
 
 MANPAGES1=\
  eclat.1\
+ eclat-addr2ec2.1\
+ eclat-addr2vpc.1\
  eclat-assocaddr.1\
  eclat-atvol.1\
  eclat-chvol.1\
  eclat-clrsattr.1\
  eclat-dmesg.1\
  eclat-cpimg.1\
diff --git a/doc/eclat-addr2ec2.1 b/doc/eclat-addr2ec2.1
new file mode 100644
index 0000000..983fc8f
--- /dev/null
+++ b/doc/eclat-addr2ec2.1
@@ -0,0 +1,66 @@
+.\" This file is part of Eclat -*- nroff -*-
+.\" Copyright (C) 2012-2019 Sergey Poznyakoff
+.\"
+.\" Eclat is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 3, or (at your option)
+.\" any later version.
+.\"
+.\" Eclat is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
+.TH ECLAT-ADDR2EC2 1 "November 26, 2019" "ECLAT" "Eclat User Reference"
+.SH NAME
+eclat-addr2ec2 \- Move VPC IP address back to EC2 Classic
+.SH SYNOPSIS
+.nh
+.na
+\fBeclat addr2ec2\fR \fIIP\fR
+.PP
+\fBeclat restore-address-to-classic\fR \fIIP\fR
+.PP
+\fBeclat addr2ec2\fR \fB\-\-help\fR
+.ad
+.hy
+.SH DESCRIPTION
+Restores an Elastic IP address that was previously moved to the
+EC2-VPC platform back to the EC2-Classic platform (addresses are
+moved to EC2-VPC using the
+.BR eclat\-addr2vpc (1)
+command).
+You cannot move an
+Elastic IP address that was originally allocated for use in
+EC2-VPC.  The Elastic IP address must not be associated with an
+instance or network interface.
+.PP
+.PP
+To move the address back to EC2 classic, use
+.BR "eclat addr2ec2".
+.SH "SEE ALSO"
+.BR eclat (1),
+.BR eclat\-addr2vpc (1).
+.SH AUTHORS
+Sergey Poznyakoff
+.SH "BUG REPORTS"
+Report bugs to <bug\-eclat@gnu.org.ua>.
+.SH COPYRIGHT
+Copyright \(co 2012-2019 Sergey Poznyakoff
+.br
+.na
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+.ad
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+.\" Local variables:
+.\" eval: (add-hook 'write-file-hooks 'time-stamp)
+.\" time-stamp-start: ".TH [A-Z_][A-Z0-9_.\\-]* [0-9] \""
+.\" time-stamp-format: "%:B %:d, %:y"
+.\" time-stamp-end: "\""
+.\" time-stamp-line-limit: 20
+.\" end:
+
diff --git a/doc/eclat-addr2vpc.1 b/doc/eclat-addr2vpc.1
new file mode 100644
index 0000000..dec6bda
--- /dev/null
+++ b/doc/eclat-addr2vpc.1
@@ -0,0 +1,59 @@
+.\" This file is part of Eclat -*- nroff -*-
+.\" Copyright (C) 2012-2019 Sergey Poznyakoff
+.\"
+.\" Eclat is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 3, or (at your option)
+.\" any later version.
+.\"
+.\" Eclat is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with Eclat.  If not, see <http://www.gnu.org/licenses/>.
+.TH ECLAT-ADDR2VPC 1 "November 26, 2019" "ECLAT" "Eclat User Reference"
+.SH NAME
+eclat-addr2vpc \- Move IP address from EC2 to EC2-VPC
+.SH SYNOPSIS
+.nh
+.na
+\fBeclat addr2vpc\fR \fIIP\fR
+.PP
+\fBeclat move-address-to-vpc\fR \fIIP\fR
+.PP
+\fBeclat addr2vpc\fR \fB\-\-help\fR
+.ad
+.hy
+.SH DESCRIPTION
+Moves the Elastic IP address \fIIP\fR from the EC2-Classic platform to
+the EC2-VPC platform.  \fIIP\fR must be allocated to your account for
+more than 24 hours, and it must not be associated with an instance.
+.PP
+To move the address back to EC2 classic, use
+.BR "eclat addr2ec2".
+.SH "SEE ALSO"
+.BR eclat (1),
+.BR eclat\-addr2ec2 (1).
+.SH AUTHORS
+Sergey Poznyakoff
+.SH "BUG REPORTS"
+Report bugs to <bug\-eclat@gnu.org.ua>.
+.SH COPYRIGHT
+Copyright \(co 2012-2019 Sergey Poznyakoff
+.br
+.na
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+.ad
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+.\" Local variables:
+.\" eval: (add-hook 'write-file-hooks 'time-stamp)
+.\" time-stamp-start: ".TH [A-Z_][A-Z0-9_.\\-]* [0-9] \""
+.\" time-stamp-format: "%:B %:d, %:y"
+.\" time-stamp-end: "\""
+.\" time-stamp-line-limit: 20
+.\" end:
+
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 7d0b355..d508fbf 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -72,15 +72,17 @@ FLNFILES=\
  modify-image-attribute.fln\
  modify-instance-attribute.fln\
  modify-snapshot-attribute.fln\
  modify-subnet-attribute.fln\
  modify-volume.fln\
  modify-vpc-attribute.fln\
+ move-address-to-vpc.fln\
  reboot-instances.fln\
  release-address.fln\