diff --git a/.gitignore b/.gitignore
index d2da53b..17446ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /avogadroapp-1.95.1.tar.gz
 /avogadro-i18n-master.zip
 /avogadroapp-1.96.0.tar.gz
+/avogadro-i18n-1.97.0.tar.gz
+/avogadroapp-1.97.0.tar.gz
diff --git a/avogadro2-avoid_i18n_download.patch b/avogadro2-avoid_i18n_download.patch
index 273fdf9..240c772 100644
--- a/avogadro2-avoid_i18n_download.patch
+++ b/avogadro2-avoid_i18n_download.patch
@@ -24,6 +24,6 @@
 -  FILES_MATCHING PATTERN "*.qm"
 -)
 -
- if(INSTALL_BUNDLE_FILES)
+ if(APPLE OR WIN32 OR INSTALL_BUNDLE_FILES)
  # copy the qt translation files
  get_filename_component(_qttranslationdir "${Qt5_DIR}/../../../translations" ABSOLUTE)
diff --git a/avogadro2.spec b/avogadro2.spec
index 271676b..5324cd2 100644
--- a/avogadro2.spec
+++ b/avogadro2.spec
@@ -7,17 +7,17 @@
 %bcond_with qt6
 
 # Package language files
-%bcond_with lang
+%bcond_without lang
 
 Name:           avogadro2
-Version:        1.96.0
-Release:        2%{?dist}
+Version:        1.97.0
+Release:        1%{?dist}
 Summary:        Advanced molecular editor
 License:        BSD
 URL:            http://avogadro.openmolecules.net/
 Source0:        https://github.com/OpenChemistry/avogadroapp/archive/%{version}/avogadroapp-%{version}.tar.gz
 Source1:        %{name}.appdata.xml
-Source2:        https://github.com/OpenChemistry/avogadro-i18n/archive/refs/heads/master.zip#/avogadro-i18n-master.zip
+Source2:        https://github.com/OpenChemistry/avogadro-i18n/archive/refs/tags/avogadro-i18n-%{version}.tar.gz
 
 Patch0:         %{name}-avoid_i18n_download.patch
 
@@ -50,6 +50,7 @@ BuildRequires:  libappstream-glib
 
 Requires: python%{python3_pkgversion}
 Requires: openbabel%{?_isa} >= 3.1.1
+Requires: xtb%{?_isa}
 Requires: avogadro2-libs%{?_isa} >= 0:%{version}
 
 # Avogadro-1.2.0 requires openbabel2,
@@ -84,8 +85,8 @@ Supplements:    (%{name} = %{version}-%{release} and langpacks-%{1})\
 %{2} language data for %{name}.\
 \
 %files          langpack-%{1}\
-/usr/share/%{name}/translations/avogadroapp-%{1}.qm
-/usr/share/%{name}/translations/avogadrolibs-%{1}.qm
+/usr/share/%{name}/i18n/avogadroapp-%{1}.qm \
+/usr/share/%{name}/i18n/avogadrolibs-%{1}.qm
 
 %lang_subpkg af Afrikaans
 %lang_subpkg ar Arabic
@@ -149,7 +150,7 @@ Supplements:    (%{name} = %{version}-%{release} and langpacks-%{1})\
 %autopatch -p1
 
 %if %{with lang}
-cd avogadro-i18n-master
+cd avogadro-i18n-%{version}
 mv avogadroapp/avogadroapp-ca@valencia.qm avogadroapp/avogadroapp-ca_VA.qm
 mv avogadrolibs/avogadrolibs-ca@valencia.qm avogadrolibs/avogadrolibs-ca_VA.qm
 %endif
@@ -158,7 +159,6 @@ mv avogadrolibs/avogadrolibs-ca@valencia.qm avogadrolibs/avogadrolibs-ca_VA.qm
 %if 0%{?el7}
 %{?dts:source /opt/rh/devtoolset-8/enable}
 %endif
-export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
 export CFLAGS="%{optflags} -I%{_includedir}/%{name}"
 export CXXFLAGS="%{optflags} -I%{_includedir}/%{name}"
 # RHBZ #1996330
@@ -172,7 +172,7 @@ export CXXFLAGS="%{optflags} -DEIGEN_ALTIVEC_DISABLE_MMA"
  -DENABLE_TESTING:BOOL=OFF \
  -DAvogadroLibs_DIR:PATH=%{_libdir} \
  -DBUILD_DOCUMENTATION:BOOL=ON \
- -DCMAKE_INSTALL_LOCALEDIR:PATH=%{_datadir}/%{name}/translations
+ -DCMAKE_INSTALL_LOCALEDIR:PATH=%{_datadir}/%{name}/i18n
 %cmake_build
 
 %install
@@ -194,10 +194,9 @@ mkdir -p %{buildroot}%{_datadir}/icons/%{name}
 cp -a avogadro/icons/* %{buildroot}%{_datadir}/icons/%{name}/
 
 %if %{with lang}
-mkdir -p %{buildroot}%{_datadir}/%{name}/translations
-install -pm 644 avogadro-i18n-master/avogadroapp/* %{buildroot}%{_datadir}/%{name}/translations/
-install -pm 644 avogadro-i18n-master/avogadrolibs/* %{buildroot}%{_datadir}/%{name}/translations/
-#install -pm 644 i18n/* %%{buildroot}%%{_datadir}/i18n/locales/
+mkdir -p %{buildroot}%{_datadir}/%{name}/i18n
+install -pm 644 avogadro-i18n-%{version}/avogadroapp/* %{buildroot}%{_datadir}/%{name}/i18n/
+install -pm 644 avogadro-i18n-%{version}/avogadrolibs/* %{buildroot}%{_datadir}/%{name}/i18n/
 %endif
 
 %if 0%{?fedora}
@@ -238,10 +237,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 %{_datadir}/icons/%{name}
 %if %{with lang}
 %dir %{_datadir}/%{name}
-%exclude %{_datadir}/%{name}/translations
+%exclude %{_datadir}/%{name}/i18n
 %endif
 
 %changelog
+* Fri Jul 22 2022 Antonio Trande <sagitter@fedoraproject.org> - 1.97.0-1
+- Release 1.97.0
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.96.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 25a5376..1669cb8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (avogadro-i18n-master.zip) = 83b29cf419cd1ae01747af89889992e60b78a8fcbca45ce68e01573e4c1523cf90ecd15299d752c64fa77d4c88c600db9349ca831ed9c194b5035e0e1df5a353
-SHA512 (avogadroapp-1.96.0.tar.gz) = bb8417eca62027aaba7cfa200cf3ec62896c2caf37cb06fe079e2d1acc483d8c4be72a1deb7cf4d2bfc096d05ffe34b86c19189e002f43a7d8dc6a63820c60c5
+SHA512 (avogadro-i18n-1.97.0.tar.gz) = efe74b8a2846c28543b8d777bc623aced0f3cb08dc4b9561689357e07d17606636f08f443be7228615df84d4128436d18f41378ebe8ecc7cf54fd98a479ad1d8
+SHA512 (avogadroapp-1.97.0.tar.gz) = 19a0bcf01a840da29c4bab6eed55c879c10d773ee5dcfab613e6666708916bfd8398e44237c18de4e5bb3247d3c4bed3844cac47cf7f3a94dc96d7df8eb13579