diff --git a/VERSION b/VERSION
index bb87e02e8..1ae61b7e2 100644
--- a/VERSION
+++ b/VERSION
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3475"
+BUILD_NUM="3476"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/VERSION.h b/VERSION.h
index 8eb4b0bb7..2de1838f6 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "4.2.0.3475"
+#define VERSION      "4.2.0.3476"
 #define GENERATION   "4.2"
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 228cc3b2b..dd66bd0e7 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,11 @@
 2011-02-14  vadim  <vadim@netcitadel.com>
 
+	* OSConfigurator_freebsd.cpp (interfaceConfigLineBridge): fixes
+	#2092 "option "stp" should be optional in the ifconfig command
+	that builds bridge interface for FreeBSD". The dialog provides
+	checkbox "Enable STP", parameter "stp" will be added to the
+	ifconfig command only when the checkbox is turned on.
+
 	* pfAdvancedDialog.cpp (pfAdvancedDialog): fixes #1866 "support
 	for pf option set state-policy", #1868 "support for pf
 	option set block-policy", #1869 "support for pf option set debug".
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index 3e11e1ce9..ef31bc3a8 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 4.2.0.3475
+%define version 4.2.0.3476
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index cf436b87e..e4719b2d3 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.0.3475-1
+Version: 4.2.0.3476-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 3b4904cd6..e9caf218a 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 4.2.0.3475
+%define version 4.2.0.3476
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/src/libgui/bsdIfaceOptsDialog.cpp b/src/libgui/bsdIfaceOptsDialog.cpp
index b6bd590e6..6318fa566 100644
--- a/src/libgui/bsdIfaceOptsDialog.cpp
+++ b/src/libgui/bsdIfaceOptsDialog.cpp
@@ -162,8 +162,12 @@ void bsdIfaceOptsDialog::typeChanged(const QString&)
         m_dialog->options_stack->setCurrentIndex(2);
         return;
     }
-    // there is also page 3 for bridge (with just "enable stp"
-    // checkbox) but we dont use it yet
+
+    if (new_type == "bridge")
+    {
+        m_dialog->options_stack->setCurrentIndex(3);
+        return;
+    }
 
     // page 0 is empty
     m_dialog->options_stack->setCurrentIndex(0);
diff --git a/src/pflib/OSConfigurator_freebsd.cpp b/src/pflib/OSConfigurator_freebsd.cpp
index 731c5640f..a39c6fdef 100644
--- a/src/pflib/OSConfigurator_freebsd.cpp
+++ b/src/pflib/OSConfigurator_freebsd.cpp
@@ -336,11 +336,17 @@ void OSConfigurator_freebsd::interfaceConfigLineBridge(Interface *iface,
     FWOptions* options = fw->getOptionsObject();
     if (options->getBool("generate_rc_conf_file"))
     {
+        FWOptions *ifopt = iface->getOptionsObject();
+        assert(ifopt != NULL);
+
+        bool enable_stp = ifopt->getBool("enable_stp");
+
         QStringList outp;
         QStringList bp;
         foreach(QString bridge_port, bridge_port_names)
         {
-            bp << QString("addm %1 stp %2").arg(bridge_port).arg(bridge_port);
+            bp << QString("addm %1 %2 %3")
+                .arg(bridge_port).arg((enable_stp)?"stp":"").arg(bridge_port);
         }
 
         bp << "up";