diff --git a/builds/install/arch-specific/solaris/CS/prototype.in b/builds/install/arch-specific/solaris/CS/prototype.in
index 1443a4748a..360c6bc1cf 100644
--- a/builds/install/arch-specific/solaris/CS/prototype.in
+++ b/builds/install/arch-specific/solaris/CS/prototype.in
@@ -18,7 +18,7 @@ d none @prefix@ 0751 firebird firebird
 
 v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb  0660 firebird firebird
 v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf  0444 firebird firebird
-v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf.in  0444 firebird firebird
+v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf  0444 firebird firebird
 v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird
 f none @prefix@/CHANGELOG.md=$SRCDIR/../../CHANGELOG.md 0644 firebird firebird
 f none @prefix@/README.md=$SRCDIR/../../README.md 0644 firebird firebird
diff --git a/builds/install/arch-specific/solaris/SS/prototype.in b/builds/install/arch-specific/solaris/SS/prototype.in
index bb928b98a3..35bd67adb8 100644
--- a/builds/install/arch-specific/solaris/SS/prototype.in
+++ b/builds/install/arch-specific/solaris/SS/prototype.in
@@ -18,7 +18,7 @@ d none @prefix@ 0755 firebird firebird
 
 v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb  0660 firebird firebird
 v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf  0644 firebird firebird
-v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf.in  0544 firebird firebird
+v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf  0544 firebird firebird
 v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird
 f none @prefix@/CHANGELOG.md=$SRCDIR/../../CHANGELOG.md 0644 firebird firebird
 f none @prefix@/README.md=$SRCDIR/../../README.md 0644 firebird firebird
diff --git a/builds/install/arch-specific/win32/BuildExecutableInstall.bat b/builds/install/arch-specific/win32/BuildExecutableInstall.bat
index 2c0ba91ce9..095c01c752 100644
--- a/builds/install/arch-specific/win32/BuildExecutableInstall.bat
+++ b/builds/install/arch-specific/win32/BuildExecutableInstall.bat
@@ -406,7 +406,7 @@ endlocal
 :: Generate sample databases file
 ::===============================
 @echo   Creating sample databases.conf
-copy %FB_ROOT_PATH%\builds\install\misc\databases.conf.in %FB_OUTPUT_DIR%\databases.conf > nul
+copy %FB_ROOT_PATH%\builds\install\misc\databases.conf %FB_OUTPUT_DIR%\databases.conf > nul
 
 ::End of DB_CONF
 ::-----------------
diff --git a/builds/install/misc/databases.conf.in b/builds/install/misc/databases.conf
similarity index 100%
rename from builds/install/misc/databases.conf.in
rename to builds/install/misc/databases.conf
diff --git a/builds/install/misc/firebird.conf.in b/builds/install/misc/firebird.conf
similarity index 100%
rename from builds/install/misc/firebird.conf.in
rename to builds/install/misc/firebird.conf
diff --git a/builds/win32/make_all.bat b/builds/win32/make_all.bat
index a7e2cbe8d2..698ae1bd50 100644
--- a/builds/win32/make_all.bat
+++ b/builds/win32/make_all.bat
@@ -63,10 +63,10 @@ for %%v in (gpre_boot build_msg codes) do (
 )
 
 :: Firebird.conf, etc
-@copy %FB_GEN_DIR%\firebird.msg %FB_OUTPUT_DIR% > nul
-@copy %FB_ROOT_PATH%\builds\install\misc\firebird.conf.in %FB_OUTPUT_DIR%\firebird.conf
-@copy %FB_ROOT_PATH%\builds\install\misc\databases.conf.in %FB_OUTPUT_DIR%\databases.conf >nul
-@copy %FB_ROOT_PATH%\builds\install\misc\fbintl.conf %FB_OUTPUT_DIR%\intl >nul
+@copy %FB_GEN_DIR%\firebird.msg %FB_OUTPUT_DIR%\ > nul
+@copy %FB_ROOT_PATH%\builds\install\misc\firebird.conf %FB_OUTPUT_DIR%\firebird.conf >nul
+@copy %FB_ROOT_PATH%\builds\install\misc\databases.conf %FB_OUTPUT_DIR%\databases.conf >nul
+@copy %FB_ROOT_PATH%\builds\install\misc\fbintl.conf %FB_OUTPUT_DIR%\intl\ >nul
 @copy %FB_ROOT_PATH%\builds\install\misc\plugins.conf %FB_OUTPUT_DIR% >nul
 @copy %FB_ROOT_PATH%\builds\install\misc\replication.conf %FB_OUTPUT_DIR% >nul
 @copy %FB_ROOT_PATH%\src\utilities\ntrace\fbtrace.conf %FB_OUTPUT_DIR% >nul
diff --git a/builds/win32/make_boot.bat b/builds/win32/make_boot.bat
index dd00e6e3bd..d7c77277d1 100644
--- a/builds/win32/make_boot.bat
+++ b/builds/win32/make_boot.bat
@@ -75,7 +75,7 @@ if "%ERRLEV%"=="1" goto :END
 call :isql
 if "%ERRLEV%"=="1" goto :END
 
-@copy %FB_ROOT_PATH%\builds\install\misc\firebird.conf.in %FB_BIN_DIR%\firebird.conf
+@copy %FB_ROOT_PATH%\builds\install\misc\firebird.conf %FB_BIN_DIR%\firebird.conf
 
 :: Copy ICU and zlib both to Debug and Release configurations
 
diff --git a/configure.ac b/configure.ac
index 8dead2da79..c0e1398f62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1251,8 +1251,8 @@ dnl common files for all posix hosts
 dnl TODO: fix "arch-specific/linux/" paths for common posix scripts with SVN
 for fb_tgt in $FB_TARGETS; do
 AC_CONFIG_FILES([
-gen/$fb_tgt/firebird/firebird.conf:builds/install/misc/firebird.conf.in
-gen/$fb_tgt/firebird/databases.conf:builds/install/misc/databases.conf.in
+gen/$fb_tgt/firebird/firebird.conf:builds/install/misc/firebird.conf
+gen/$fb_tgt/firebird/databases.conf:builds/install/misc/databases.conf
 gen/$fb_tgt/firebird/fbtrace.conf:src/utilities/ntrace/fbtrace.conf
 gen/$fb_tgt/firebird/intl/fbintl.conf:builds/install/misc/fbintl.conf
 gen/$fb_tgt/firebird/plugins.conf:builds/install/misc/plugins.conf
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b46b91ec12..b890c4ea8b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -909,8 +909,8 @@ add_custom_target(copy_files
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security4.fdb
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/help.fdb ${output_dir}/help/help.fdb
     # configs, text files
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf.in ${output_dir}/firebird.conf
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/databases.conf.in ${output_dir}/databases.conf
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf ${output_dir}/firebird.conf
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/databases.conf ${output_dir}/databases.conf
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/fbintl.conf ${output_dir}/intl/fbintl.conf
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/plugins.conf ${output_dir}/plugins.conf
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/IPLicense.txt ${output_dir}/IPLicense.txt
diff --git a/src/jrd/constants.h b/src/jrd/constants.h
index 8e0268cc77..72b463455f 100644
--- a/src/jrd/constants.h
+++ b/src/jrd/constants.h
@@ -62,7 +62,7 @@ const int TEMP_STR_LENGTH = 128;
 // Metadata constants
 
 // When changing these constants, change MaxIdentifierByteLength and MaxIdentifierCharLength in
-// firebird.conf.in too.
+// firebird.conf too.
 const unsigned METADATA_IDENTIFIER_CHAR_LEN	= 63;
 const unsigned METADATA_BYTES_PER_CHAR		= 4;