diff --git a/configure.in b/configure.in
index 739e8c593..a822f7543 100644
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,7 @@ dnl
 . ./VERSION
 
 RELEASE_NUM=$BUILD_NUM
+GENERATION_SHORT=$(echo $GENERATION | sed 's/\.//')
 
 AC_DEFINE_UNQUOTED(BUILD_NUM, "$BUILD_NUM")
 AC_SUBST(BUILD_NUM)
@@ -28,6 +29,8 @@ AC_SUBST(FWB_MAJOR_VERSION)
 AC_SUBST(FWB_MINOR_VERSION)
 AC_SUBST(FWB_MICRO_VERSION)
 AC_SUBST(FWB_VERSION)
+AC_SUBST(GENERATION)
+AC_SUBST(GENERATION_SHORT)
 
 # libfwbuilder versions
 dnl AC_SUBST(LIBFWBUILDER_VERSION)
diff --git a/packaging/fwbuilder.nsi b/packaging/fwbuilder.nsi
index 66cfebf0a..2c9fe3c29 100644
--- a/packaging/fwbuilder.nsi
+++ b/packaging/fwbuilder.nsi
@@ -11,8 +11,8 @@ Var STARTMENU_FOLDER
 ; GENERATION is used to build the path in the registry, it should be coordinated
 ; with the path defined in FWBSettings class
 ;
-!define GENERATION "@GENERATION@"
-!define GENERATION_SHORT "@GENERATION_SHORT@"
+!define GENERATION "5.1"
+!define GENERATION_SHORT "51"
 !define VERSION "5.1.0.3598"
 
 
diff --git a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h
index 073499a3d..15bab9f05 100644
--- a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h
+++ b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h
@@ -13,7 +13,7 @@
  * Template files directory dir
  * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead!
  */
-#  define RES_DIR "/home/vadim/src/v4/build/install_root/share/fwbuilder-5.1.0.3598"
+#  define RES_DIR "/usr/local/share/fwbuilder-5.1.0.3598"
 
 /* #undef UCD_SNMP */
 #  define HAVE_LIBSNMP 1
@@ -59,7 +59,7 @@
  * Template files directory dir
  * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead!
  */
-#define RES_DIR "/home/vadim/src/v4/build/install_root/share/fwbuilder-5.1.0.3598"
+#define RES_DIR "/usr/local/share/fwbuilder-5.1.0.3598"
 
 #define HAVE_LIBSNMP 1
 /* #undef UCD_SNMP */