diff --git a/build_num b/build_num
index ffaf11f85..0c1d78027 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 490
+#define BUILD_NUM 491
diff --git a/configure.in b/configure.in
index 935fbbf97..2e8e5d256 100644
--- a/configure.in
+++ b/configure.in
@@ -34,6 +34,7 @@ echo "Creating VERSION.h file..."
 echo "#define VERSION      \"$VERSION\""      > VERSION.h
 echo "#define RELEASE_NUM  \"$RELEASE_NUM\"" >> VERSION.h
 
+
 dnl try to find QT
 dnl
 AC_ARG_WITH(qtdir,[  --with-qtdir=DIR        Specify directory path for QT ])
@@ -48,8 +49,12 @@ fi
 # TODO: do we need to add $QTDIR/bin to PATH to find qmake?
 EXTENDED_PATH="/usr/local/bin:$PATH"
 
-# TODO: add support for --with-qmake option
-AC_PATH_PROG(QMAKE,  qmake,      ,[$EXTENDED_PATH])
+AC_ARG_WITH(qmake, [  --with-qmake=qmake     Specify the qmake to be used (debian qmake-qt4) ])
+if test -n "$with_qmake"; then
+    AC_PATH_PROG(QMAKE,  $with_qmake,      ,[$EXTENDED_PATH])
+else
+    AC_PATH_PROG(QMAKE,  qmake,      ,[$EXTENDED_PATH])
+fi
 if test -z "$QMAKE"; then
     AC_MSG_ERROR("Could not find qmake")
 fi
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9ddcf33d3..7be996dca 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,9 @@
 2008-08-27  Vadim Kurland  <vadim@vk.crocodile.org>
 
+	* configure.in: Applied patch per bug #2079941: "Patch for
+	configure.in --with-qmake". Patch adds option --with-qmake to
+	configure in libfwbuilder and fwbuilder.
+
 	* iosaclAdvancedDialog.cpp (toggleGenerateLogging): fixed bug
 	#2078107: "IOS ACL compiler issue". Logging commands for IOS ACL
 	were not generated properly (settings made in the GUI were
diff --git a/qmake.inc b/qmake.inc
index 0962327fe..a6121cd74 100644
--- a/qmake.inc
+++ b/qmake.inc
@@ -11,15 +11,15 @@ SO_VERSION    = @LIBFWBUILDER_SOLIB_VERSION@
 DEFINES      += $$(DEFINES)
 LANGUAGE      = C++
 UI_DIR        = ui
-MANDIR        = /Users/vadim/src/fwb3-branch-v3/install_root/share/man/
-DOCDIR        = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
+MANDIR        = /home/vadim/src/fwb3-branch-v3/install_root/share/man/
+DOCDIR        = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
 
 HAVE_ANTLR_RUNTIME = 1
 HAVE_EXTERNAL_ANTLR = 0
 
 unix {
-    ANTLR_INCLUDEPATH =  /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/
-    ANTLR_LIBS =  /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a
+    ANTLR_INCLUDEPATH =  /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/
+    ANTLR_LIBS =  /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a
     FWBPARSER_LIB = ../parsers/libfwbparser.a
 }
 
@@ -30,38 +30,38 @@ unix {
 	MOC_DIR = .moc
 	OBJECTS_DIR = .obj
 
-	PREFIX                  = /Users/vadim/src/fwb3-branch-v3/install_root
+	PREFIX                  = /home/vadim/src/fwb3-branch-v3/install_root
 	exec_prefix             = @EXEC_PREFIX@
 	DESTDIR                 =
-	ICONSDIR                = 
+	ICONSDIR                = /home/vadim/src/fwb3-branch-v3/install_root/share//icons/hicolor/
 
-    INCLUDEPATH  += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
+    INCLUDEPATH  += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
 
-    LIBS_FWCOMPILER         = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
-    LIBS_FWBUILDER          = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
+    LIBS_FWCOMPILER         = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
+    LIBS_FWBUILDER          = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
 
 	target.path             = $$PREFIX/bin
 	dtd.path                = @TEMPLATE_DIR@/
 	migration.path          = @TEMPLATE_DIR@/migration
-	doc.path                = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
-	datadir.path		    = /Users/vadim/src/fwb3-branch-v3/install_root/share/
+	doc.path                = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
+	datadir.path		    = /home/vadim/src/fwb3-branch-v3/install_root/share/
 
 
 #	win32:target.path    = $$PREFIX/
 #	unix:target.path     = $$PREFIX/share/fwbuilder/
 #	macx:target.path     = $$PREFIX/
 
-	res.path			= ../Resources
-	res_os.path 		= ../Resources/os/
-	res_platform.path 	= ../Resources/platform/
-	res_help.path 	    = ../Resources/help/
-	res_desktop.path	= /Users/vadim/src/fwb3-branch-v3/install_root/share//applications/
+	res.path			= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0
+	res_os.path 		= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/os/
+	res_platform.path 	= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/platform/
+	res_help.path 	    = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/help/
+	res_desktop.path	= /home/vadim/src/fwb3-branch-v3/install_root/share//applications/
 
     INSTALLS		   += res 
     INSTALLS		   += res_os
     INSTALLS		   += res_platform
 #        INSTALLS   += icns
-	LIBS                   += $$LIBS_FWBUILDER  -L/sw/lib -lpoll
+	LIBS                   += $$LIBS_FWBUILDER -lutil 
 
 	PKGLOCALEDIR			= $$res.path/locale