diff --git a/VERSION b/VERSION
index f4228c656..aeeaf0bcd 100644
--- a/VERSION
+++ b/VERSION
@@ -2,12 +2,12 @@
 
 FWB_MAJOR_VERSION=4
 FWB_MINOR_VERSION=2
-FWB_MICRO_VERSION=1
+FWB_MICRO_VERSION=2
 
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3540"
+BUILD_NUM="3541"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/VERSION.h b/VERSION.h
index 73ef8f3fa..fd5c24f3e 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "4.2.1.3540"
+#define VERSION      "4.2.2.3541"
 #define GENERATION   "4.2"
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f86131f86..98915236d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,17 @@
+2011-05-11  vadim  <vadim@netcitadel.com>
+
+	* newFirewallDialog.cpp (finishClicked): fixes #2395 "Crash when
+	setting installer directory location" and fixes #2396 "Crash when
+	changing firewall name". These two bug reports where the
+	manifestation of the same problem that was introduced by the fix
+	for #2380. When user hits OK in the newFirewallDialog and it
+	merges temporary object tree into the main object tree, it should
+	call fixTree() to fix all pointers to the root of the tree.
+
+2011-05-10  vadim  <vadim@netcitadel.com>
+
+	* v4.2.1 released
+
 2011-05-09  Vadim Kurland  <vadim@netcitadel.com>
 
 	* FWCmdAddObject.cpp (redo): fixes #2391 "selecting 'new library'
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index 2c39e80ea..b6a366bac 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 4.2.1.3540
+%define version 4.2.2.3541
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index 08ed44d31..cdfc0b0b2 100644
--- a/packaging/fwbuilder.control
+++ b/packaging/fwbuilder.control
@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
 Priority: extra
 Section: checkinstall
 Maintainer: vadim@fwbuilder.org
-Version: 4.2.1.3540-1
+Version: 4.2.2.3541-1
 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
 Description: Firewall Builder GUI and policy compilers
diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec
index 539e170e5..56a654855 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 4.2.1.3540
+%define version 4.2.2.3541
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/src/libgui/ObjectManipulator_create_new.cpp b/src/libgui/ObjectManipulator_create_new.cpp
index b13becfe6..ab10836ab 100644
--- a/src/libgui/ObjectManipulator_create_new.cpp
+++ b/src/libgui/ObjectManipulator_create_new.cpp
@@ -504,6 +504,7 @@ FWObject* ObjectManipulator::newFirewall(QUndoCommand* macro)
         FWCmdAddObject *cmd = new FWCmdAddObject(
             m_project, parent, NULL, QObject::tr("Create new Firewall"), macro);
         FWObject *new_state = cmd->getNewState();
+
         parent->remove(nfw, false);
         new_state->add(nfw);
     }
diff --git a/src/libgui/newFirewallDialog.cpp b/src/libgui/newFirewallDialog.cpp
index 589a5a298..0fb664464 100644
--- a/src/libgui/newFirewallDialog.cpp
+++ b/src/libgui/newFirewallDialog.cpp
@@ -1276,6 +1276,9 @@ void newFirewallDialog::finishClicked()
 
     CompareObjectsDialog cod(this);
     db_orig->merge(db_copy, &cod);
+    db_orig->fixTree();
+
+    nfw = Firewall::cast(db_orig->findInIndex(nfw->getId()));
 
 
     if (tmpldb!=NULL)