diff --git a/.gitignore b/.gitignore
index f49f0856..9387a948 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,6 @@ missing
 node_modules/
 org.eclipse.core.resources.prefs
 tags
+
+# ignore compiled translations
+*.mo
diff --git a/CHANGES.rst b/CHANGES.rst
index 42fa3082..d538f830 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -24,6 +24,15 @@
 Changes
 =======
 
+Version 0.2.1 (release 2015-08-12)
+----------------------------------
+
+Bug fixes
+~~~~~~~~~
+
+- Adapts tests for non-repeatable subfields fixed in DoJSON==0.1.1.
+- Adds missing dependencies "JSONSchema" and  "invenio-formatter".
+
 Version 0.2.0 (release 2015-07-29)
 ----------------------------------
 
diff --git a/MANIFEST.in b/MANIFEST.in
index a8ff7d66..c44904d2 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -26,6 +26,7 @@ include *.py
 include *.rst
 include *.txt
 include LICENSE
+include babel.ini
 include pytest.ini
 include tox.ini
 recursive-include docs *.py
@@ -35,8 +36,10 @@ recursive-include invenio_records *.cfg
 recursive-include invenio_records *.css
 recursive-include invenio_records *.html
 recursive-include invenio_records *.js
+recursive-include invenio_records *.mo
+recursive-include invenio_records *.po
+recursive-include invenio_records *.pot
 recursive-include invenio_records *.py
-recursive-include misc *.py
-recursive-include misc *.rst
 recursive-include tests *.cfg
 recursive-include tests *.py
+recursive-include tests *.xml
diff --git a/RELEASE-NOTES.rst b/RELEASE-NOTES.rst
index 6a3a6e84..cc4756ef 100644
--- a/RELEASE-NOTES.rst
+++ b/RELEASE-NOTES.rst
@@ -1,8 +1,8 @@
 ========================
- Invenio-Records v0.2.0
+ Invenio-Records v0.2.1
 ========================
 
-Invenio-Records v0.2.0 was released on July 29, 2015.
+Invenio-Records v0.2.1 was released on August 12, 2015.
 
 About
 -----
@@ -11,33 +11,21 @@ Invenio-Records is a metadata storage module.
 
 *This is an experimental development preview release.*
 
-New features
-------------
-
-- Moves PID provider for recids and Datacite tasks from Invenio.
-- Adds new config variable RECORD_PROCESSORS that allows to specify
-  which processors to use depending on the input type.
-
-Improved features
------------------
-
-- If no record is found return `None` instead of raising
-  `AttributeError`.
-
 Bug fixes
 ---------
 
-- Fixes export of records in non HTML formats.
+- Adapts tests for non-repeatable subfields fixed in DoJSON==0.1.1.
+- Adds missing dependencies "JSONSchema" and  "invenio-formatter".
 
 Installation
 ------------
 
-   $ pip install invenio-records==0.2.0
+   $ pip install invenio-records==0.2.1
 
 Documentation
 -------------
 
-   http://invenio-records.readthedocs.org/en/v0.2.0
+   http://invenio-records.readthedocs.org/en/v0.2.1
 
 Happy hacking and thanks for flying Invenio-Records.
 
diff --git a/invenio_records/version.py b/invenio_records/version.py
index f055a461..0daaebcb 100644
--- a/invenio_records/version.py
+++ b/invenio_records/version.py
@@ -28,4 +28,4 @@
 and parsed by ``setup.py``.
 """
 
-__version__ = "0.2.1.dev20150729"
+__version__ = "0.2.1"
diff --git a/misc/header.py b/misc/header.py
deleted file mode 100644
index f654a0ad..00000000
--- a/misc/header.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This file is part of Invenio.
-# Copyright (C) 2015 CERN.
-#
-# Invenio 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 2 of the
-# License, or (at your option) any later version.
-#
-# Invenio 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 Invenio; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307, USA.
-#
-# In applying this license, CERN does not
-# waive the privileges and immunities granted to it by virtue of its status
-# as an Intergovernmental Organization or submit itself to any jurisdiction.
diff --git a/misc/header.rst b/misc/header.rst
deleted file mode 100644
index dac5bd6b..00000000
--- a/misc/header.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-..
-    This file is part of Invenio.
-    Copyright (C) 2015 CERN.
-
-    Invenio 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 2 of the
-    License, or (at your option) any later version.
-
-    Invenio 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 Invenio; if not, write to the
-    Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-    MA 02111-1307, USA.
-
-    In applying this license, CERN does not
-    waive the privileges and immunities granted to it by virtue of its status
-    as an Intergovernmental Organization or submit itself to any jurisdiction.