diff --git a/build.gradle b/build.gradle
index 3c6a307d3e..40443bc562 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,7 @@ subprojects { subProject ->
     defaultTasks 'build'
 
     group = 'org.hibernate'
-    version = '4.2.1-SNAPSHOT'
+    version = '4.2.1.Final'
 
     // minimize changes, at least for now (gradle uses 'build' by default)..
     buildDir = "target"
diff --git a/changelog.txt b/changelog.txt
index 42bb729e56..c9bd3ab5e4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,6 +5,52 @@ match the actual issue resolution (i.e. a bug might not be a bug). Please
 refer to the particular case on JIRA using the issue tracking number to learn
 more about each case.
 
+Changes in version 4.2.1.Final (2013.04.24)
+------------------------------------------------------------------------------------------------------------------------
+
+Sub-task
+    [HHH-7617] - Gradle eclipse task missing src paths and test source generation
+    [HHH-7993] - Support jar scanning in OSGi
+
+Bug
+    [HHH-1904] - Identifier too long
+    [HHH-5845] - Lazy Loading of audited entites with revision type 'delete'
+    [HHH-6496] - ClassCastException inside proxy without explicit casting in application code
+    [HHH-7357] - Incorrect exception translation when using Oracle
+    [HHH-7478] - ConcurrentModificationException when adding a BeforeTransactionCompletionProcess from with a PostInsertEventListener for an @Audited entity
+    [HHH-7880] - SessionFactory.openStatelessSession() does not respect tenant identifier from CurrentTenantIdentifierResolver
+    [HHH-7974] - Session.getTenantIdentifier() not callable without active transaction
+    [HHH-7984] - Prepared statement for callable returning cursor not closed
+    [HHH-8049] - Initialization error with <dynamic-component> mapping
+    [HHH-8082] - HQLScrollFetchTest.testScroll hangs on DB2-97
+    [HHH-8084] - LobMergeTest fails on oracle
+    [HHH-8085] - QueryCacheTest.testGetByCompositeId fails on db2-97 -- DB2 SQL Error: SQLCODE=-613
+    [HHH-8087] - Envers delete doesn't insert a new row with revtype=2 for unidirectional manytomany collections
+    [HHH-8092] - Configuration#generateSchemaUpdateScript does not create unique constraints
+    [HHH-8103] - Oracle LOB ordering not working with SequenceIdentityGenerator
+    [HHH-8136] - Correct "to_char" function in HSQL
+    [HHH-8171] - Auditing of collections of embeddables only supporting single element changes
+    [HHH-8178] - Natural IDs generating one UniqueKey per Column
+    [HHH-8182] - Correct intermittent UpgradeLockTest failures
+    [HHH-8189] - Audit records are not rolled back when transaction is rolled back
+    [HHH-8203] - Hibernate 4.x can't work with proxool 0.9.1
+
+Improvement
+    [HHH-7605] - Provide details "An entity copy was already assigned to a different entity."
+    [HHH-7714] - Add support for EntityMode.MAP to JPA Criteria API
+    [HHH-7869] - bad performance problem with org.hibernate.internal.util.StringHelper#firstIndexOfChar
+    [HHH-7908] - Logging level checking.
+    [HHH-8096] - Re-work the OSGi class loading concepts
+    [HHH-8122] - Scrub known-sensitive settings from EMF.getProperties()
+    [HHH-8162] - Make unique constraint handling on schema update configurable
+    [HHH-8180] - Improve performance of logging level checks
+    [HHH-8183] - Also support synonyms for schema validation
+
+Task
+    [HHH-8095] - Upgrade to JTA API 1.0.1
+    [HHH-8175] - Add support for Postgresql 9.2, Postgres Plus 9.2 and IBM DB2 10.1
+    [HHH-8186] - Type in docs? Caching section nonstrict != nontrict
+
 Changes in version 4.2.0.Final (2013.03.18)
 ------------------------------------------------------------------------------------------------------------------------