diff --git a/documentation/Doxyfile b/documentation/Doxyfile
index 57c1362f..7bddb7a5 100644
--- a/documentation/Doxyfile
+++ b/documentation/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = mrfioc2
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.0.4
+PROJECT_NUMBER         = 2.1.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -604,7 +604,7 @@ INPUT                  = ../mrfCommon \
 # into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
 # the list of possible encodings.
 
-INPUT_ENCODING         = ISO-8859-1
+INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
diff --git a/documentation/mainpage.h b/documentation/mainpage.h
index 3f5cbc5f..0cffc84a 100644
--- a/documentation/mainpage.h
+++ b/documentation/mainpage.h
@@ -63,7 +63,7 @@ For the generator see mrmEvgSetupVME() or the ::evgMrm class.
 
 @section changelog Changelog
 
-@subsection v210 2.1.0 (UNRELEASED)
+@subsection v210 2.1.0 (Oct. 2016)
 
 @subsubsection v210change Incompatible changes
 
@@ -210,7 +210,17 @@ For the generator see mrmEvgSetupVME() or the ::evgMrm class.
 
 @author Jayesh Shah <jshah@bnl.gov>
 
-@author Eric Bj�rklund <bjorklund@lanl.gov>
+@author Eric Björklund <bjorklund@lanl.gov>
+
+@author Slejko Tom <tom.slejko@psi.ch>
+
+@author Helge Brands <helge.brands@psi.ch>
+
+@author Saso Skube <saso.skube@psi.ch>
+
+@author Jure Krasna <jure.krasna@cosylab.com>
+
+@author Dirk Zimoch <dirk.zimoch@psi.ch>
 
 */
 
diff --git a/mrfCommon/src/Makefile b/mrfCommon/src/Makefile
index 10e6704b..37d74b8a 100644
--- a/mrfCommon/src/Makefile
+++ b/mrfCommon/src/Makefile
@@ -6,7 +6,7 @@ USR_CPPFLAGS += -DDEBUG_PRINT
 
 export PERL5LIB=$(EPICS_BASE)/lib/perl
 
-MRF_VERSION = 2.0.4
+MRF_VERSION = 2.1.0
 
 #---------------------
 # Install include files