diff --git a/changelog b/changelog
index 0b657111..3437c941 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,37 @@
+2014 01 28 - v12.1
+
+This is a maintenance release with some minor bug fixes and a new configuration
+directive, INDEXES_SUFFIX, to allow appending a suffix to indexes names.
+
+	- Fix example given for the WHERE configuration directive. Thanks to
+	  Bob Treumann for the report.
+	- Add INDEXES_SUFFIX configuration option to allow append a suffix to
+	  indexes names.
+	- Replace special charater ^M by \r as they are not supported by git.
+	- Fix IF EXISTS in alter table of sub _drop_foreign_keys. Thanks to
+	  Francis Corriveau for the patch.
+	- Fix isolation level when exporting data. Thanks to Ludovic Penet for
+	  the report.
+	- Fix regression when ora2pg tries to create foreign keys on tables or
+	  to tables that are not selected for export. Thanks to Ludovic Penet.
+	- Add information about backslashed comma into directive MODIFY_TYPE
+	  into Makefile.PL.
+	- Add missing MODIFY_TYPE definition in documentation.
+	- Allow backslashed comma into MODIFY_TYPE type redefinition. Example:
+		TABLE1:COL3:decimal(9\,6),TABLE1:COL4:decimal(9\,6).
+	  Thanks to Mike Kienenberger for the report
+	- Fix missing single cote into create_materialized_view() call. Thanks
+	  to Jacky Rigoreau for the patch.
+	- Fix some typo in documentation, thanks to Mike Kienenberger for the
+	  report.
+	- Add a chapter about installing DBD::Oracle into documentation. Thanks
+	  to Raghavendra for the patch.
+	- Fix case sensitivity on external table name with FDW export type.
+	  Thanks to Guillaume Lelarge for the report.
+	- Fix export of materialized views when PG_SUPPORTS_MVIEW is disabled.
+	  Thanks to Christian Bjornbak for the report.
+	- Update copyright.
+
 2013 10 22 - v12.0
 
 This release fixes lot of issues and three new features. Using REORDERING_COLUMNS
diff --git a/lib/Ora2Pg.pm b/lib/Ora2Pg.pm
index c0b49e26..42bfa34c 100644
--- a/lib/Ora2Pg.pm
+++ b/lib/Ora2Pg.pm
@@ -38,7 +38,7 @@ use IO::Pipe;
 #set locale to LC_NUMERIC C
 setlocale(LC_NUMERIC,"C");
 
-$VERSION = '12.0';
+$VERSION = '12.1';
 $PSQL = $ENV{PLSQL} || 'psql';
 
 $| = 1;
diff --git a/lib/Ora2Pg/PLSQL.pm b/lib/Ora2Pg/PLSQL.pm
index 069e65f0..482668e7 100644
--- a/lib/Ora2Pg/PLSQL.pm
+++ b/lib/Ora2Pg/PLSQL.pm
@@ -31,7 +31,7 @@ use POSIX qw(locale_h);
 setlocale(LC_NUMERIC,"C");
 
 
-$VERSION = '12.0';
+$VERSION = '12.1';
 
 #----------------------------------------------------
 # Cost scores used when converting PLSQL to PLPGSQL
diff --git a/packaging/README b/packaging/README
index cca9811b..9328c46b 100644
--- a/packaging/README
+++ b/packaging/README
@@ -12,13 +12,13 @@ RPM/
 
 	The binary package may be found here:
 
-		~/rpmbuild/RPMS/noarch/ora2pg-12.0-1.noarch.rpm
+		~/rpmbuild/RPMS/noarch/ora2pg-12.1-1.noarch.rpm
 	or
-		/usr/src/redhat/RPMS/i386/ora2pg-12.0-1.noarch.rpm
+		/usr/src/redhat/RPMS/i386/ora2pg-12.1-1.noarch.rpm
 
 	To install run:
 
-		rpm -i ~/rpmbuild/RPMS/noarch/ora2pg-12.0-1.noarch.rpm
+		rpm -i ~/rpmbuild/RPMS/noarch/ora2pg-12.1-1.noarch.rpm
 
 
 slackbuild/
@@ -30,7 +30,7 @@ slackbuild/
 	then take a look at /tmp/build/ to find the Slackware package.
 	To install run the following command:
 
-		installpkg /tmp/build/ora2pg-12.0-i486-1gda.tgz
+		installpkg /tmp/build/ora2pg-12.1-i486-1gda.tgz
 
 
 debian/
diff --git a/packaging/RPM/ora2pg.spec b/packaging/RPM/ora2pg.spec
index 6a27fad7..8c5a2b3a 100644
--- a/packaging/RPM/ora2pg.spec
+++ b/packaging/RPM/ora2pg.spec
@@ -4,7 +4,7 @@
 
 Name: %{wname}
 Epoch: 0
-Version: 12.0
+Version: 12.1
 Release: 1%{?dist}
 Summary: Oracle to PostgreSQL database schema converter
 
diff --git a/packaging/debian/ora2pg/DEBIAN/control b/packaging/debian/ora2pg/DEBIAN/control
index 2fab9136..6ab6fea1 100644
--- a/packaging/debian/ora2pg/DEBIAN/control
+++ b/packaging/debian/ora2pg/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: ora2pg
-Version: 12.0
+Version: 12.1
 Priority: optional
 Architecture: all
 Essential: no
diff --git a/packaging/slackbuild/Ora2Pg.SlackBuild b/packaging/slackbuild/Ora2Pg.SlackBuild
index 93c6bc3a..8b8c2104 100644
--- a/packaging/slackbuild/Ora2Pg.SlackBuild
+++ b/packaging/slackbuild/Ora2Pg.SlackBuild
@@ -12,7 +12,7 @@
 
 ## Fill these variables to your needs ##
 NAMESRC=${NAMESRC:-ora2pg}
-VERSION=${VERSION:-12.0}
+VERSION=${VERSION:-12.1}
 EXT=${EXT:-tar.bz2}
 NAMEPKG=${NAMEPKG:-ora2pg}
 PKGEXT=${PKGEXT:-tgz/txz}
diff --git a/packaging/slackbuild/Ora2Pg.info b/packaging/slackbuild/Ora2Pg.info
index 35dbe6d9..9228acdd 100644
--- a/packaging/slackbuild/Ora2Pg.info
+++ b/packaging/slackbuild/Ora2Pg.info
@@ -1,7 +1,7 @@
 PRGNAM="Ora2Pg"
-VERSION="12.0"
+VERSION="12.1"
 HOMEPAGE="http://ora2pg.darold.net/"
-DOWNLOAD="http://downloads.sourceforge.net/ora2pg/ora2pg-12.0.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/ora2pg/ora2pg-12.1.tar.gz"
 MD5SUM=""
 DOWNLOAD_x86_64="UNTESTED"
 MD5SUM_x86_64=""
diff --git a/scripts/ora2pg b/scripts/ora2pg
index 86f92561..35204e3b 100644
--- a/scripts/ora2pg
+++ b/scripts/ora2pg
@@ -30,7 +30,7 @@ use POSIX qw(locale_h sys_wait_h _exit);
 setlocale(LC_NUMERIC, '');
 setlocale(LC_ALL,     'C');
 
-my $VERSION = '12.0';
+my $VERSION = '12.1';
 
 my $CONFIG_FILE = '/etc/ora2pg/ora2pg.conf';
 my $DEBUG = 0;