diff --git a/HISTORY.md b/HISTORY.md
index 65b51c6e..82321b4e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,27 @@
+##0.12.1 (2013-06-09)
+
+* Added forumPostCourse notification type
+* Added groups package description to Javadocs
+* Added icons in more resolutions
+* Added wsdl folder
+* Removed all references to University of Granada (UGR) in authors section
+* Now the user input is maintained on rotation of the device
+* Inspected and improved the source code with Android Studio
+* Optimized processing of downloaded tests configurations
+* Replaced Vector class with ArrayList class for optimization purposes
+* Replaced the answers ListView with a LinearLayout in order to avoid issues with the parent
+  ScrollView in TestMake
+* Updated BugSense library
+* Avoid overriding of synchronization user preferences on application upgrades
+* Fixed activity restart on TestMake
+* Fixed NullPointerException exceptions when inserting null values into not null database fields
+* Reverted to old ksoap2-android version in order to recover SoapFault processing
+* Now handled exceptions are always shown in logcat
+* Fixed IllegalStateException: Can not perform this action after onSaveInstanceState
+  Added WeakReference to activity in order to fix this issue
+* Modified NULL value detection
+* Bugfixes
+
 ## 0.12 (2013-04-20)
 
 * Added new notification types "documentFile", "sharedFile", "enrollment"
diff --git a/SWADroid/AndroidManifest.xml b/SWADroid/AndroidManifest.xml
index 396abb2e..2a3513d6 100644
--- a/SWADroid/AndroidManifest.xml
+++ b/SWADroid/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="es.ugr.swad.swadroid"
           android:installLocation="auto"
-          android:versionCode="49"
-          android:versionName="0.12">
+          android:versionCode="50"
+          android:versionName="0.12.1">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>