diff --git a/build.xml b/build.xml
index e0c32d6c..e1765850 100755
--- a/build.xml
+++ b/build.xml
@@ -52,6 +52,13 @@
 			<equals arg1="${arch}" arg2="x86_64"/>
 		</condition>
 		<echo>Architecture is ${arch}</echo>
+		<condition property="compile.32">
+			<equals arg1="${bits}" arg2="32"/>
+		</condition>
+		<condition property="compile.64">
+			<equals arg1="${bits}" arg2="64"/>
+		</condition>
+		<echo>Compiling as ${bits}-bit application.</echo>
 		<condition property="is_debug_build">
 			<equals arg1="${src_build_type}" arg2="Debug"/>
 		</condition>
@@ -83,7 +90,11 @@
 	</target>
 	
 	<!-- Creates the Make files for our SRC that will be used during compile stage (Intel) -->
-	<target name="prepare_src_x86" depends="init,get_arch,set_compiler" description="prepare server code - Intel" if="compile.x86">
+	<target name="prepare_src_x86" depends="prepare_src_x86_32, prepare_src_x86_64" description="prepare server code - Intel" if="compile.x86">
+	</target>
+	
+	<!-- Creates the Make files for our SRC that will be used during compile stage (Intel) -->
+	<target name="prepare_src_x86_32" depends="init,get_arch,set_compiler" description="prepare server code - Intel" if="compile.x86" unless="compile.64">
 		<exec executable="cmake" dir="${build}" failonerror="true">
 			<env key="PATH" value="${env.PATH}:${tools_home}"/>
 			<env key="CC" value="${cc_compiler}" unless:true="${use_gcc}"/>
@@ -99,6 +110,19 @@
 			<arg value="${src}"/>
 		</exec>
 	</target>
+	
+	<!-- Creates the Make files for our SRC that will be used during compile stage (Intel) -->
+	<target name="prepare_src_x86_64" depends="init,get_arch,set_compiler" description="prepare server code - Intel" if="compile.x86" unless="compile.32">
+		<exec executable="cmake" dir="${build}" failonerror="true">
+			<env key="PATH" value="${env.PATH}:${tools_home}"/>
+			<env key="CC" value="${cc_compiler}" unless:true="${use_gcc}"/>
+			<env key="CXX" value="${cxx_compiler}" unless:true="${use_gcc}"/>
+			<env key="LDFLAGS" value="-L/usr/lib64"/>
+			<env key="CMAKE_PREFIX_PATH" value="/usr/lib64:/lib64"/>
+			<arg value="-DCMAKE_BUILD_TYPE=${src_build_type}"/>
+			<arg value="${src}"/>
+		</exec>
+	</target>
 
 	<!-- Creates the Make files for our SRC that will be used during compile stage (Non-Intel) -->
 	<target name="prepare_src" depends="init,get_arch,set_compiler" description="compile server code - non Intel" unless="compile.x86">
diff --git a/cmake/linux/FindOracle.cmake b/cmake/linux/FindOracle.cmake
index 26627faa..d86c1bf8 100644
--- a/cmake/linux/FindOracle.cmake
+++ b/cmake/linux/FindOracle.cmake
@@ -30,7 +30,8 @@ if(DEFINED ENV{ORACLE_HOME})
   find_path(ORACLE_INCLUDE_DIR
     NAMES oci.h
     PATHS
-	/usr/include/oracle/18.3/client
+    /usr/include/oracle/18.3/client
+    /usr/include/oracle/21/client64
     ${ORACLE_HOME}/rdbms/public
     ${ORACLE_HOME}/include
     ${ORACLE_HOME}/sdk/include  # Oracle SDK
@@ -74,6 +75,6 @@ endif(DEFINED ENV{ORACLE_HOME})
 # Handle the QUIETLY and REQUIRED arguments and set ORACLE_FOUND to TRUE
 # if all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(ORACLE DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)
+find_package_handle_standard_args(Oracle DEFAULT_MSG ORACLE_LIBRARY ORACLE_INCLUDE_DIR)
 
 mark_as_advanced(ORACLE_INCLUDE_DIR ORACLE_LIBRARY)
\ No newline at end of file