diff --git a/bitlbee.spec b/bitlbee.spec
index 30ee5bb..372df89 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -20,10 +20,17 @@
 %bcond_with purple
 %endif
 
+%if 0%{?fedora} >= 22 || 0%{?rhel} >= 8
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
+
+
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           3.4.2
-Release:           2%{?dist}
+Version:           3.5
+Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
 URL:               http://www.bitlbee.org/
@@ -61,6 +68,14 @@ BuildRequires:     libotr-devel >= 4.0
 %if %{with purple}
 BuildRequires:     libpurple-devel
 %endif
+%if %{with python3}
+BuildRequires:     python3-devel
+%else
+BuildRequires:     python2-devel
+%endif
+%if %{with purple}
+BuildRequires:     libpurple-devel
+%endif
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -108,6 +123,11 @@ echo With systemd %with_systemd
 
 %build
 # Note that we cannot use openssl in Fedora packages ... it breaks GPL
+%if %{with python3}
+export PYTHON=$(which python3)
+%else
+export PYTHON=$(which python2)
+%endif
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
         --prefix=%{_prefix} \
         --bindir=%{_sbindir} \
@@ -251,6 +271,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jan 09 2017 Matěj Cepl <mcepl@redhat.com> - 3.5-1
+- New upstream release (#1411171)
+
 * Tue Jun 14 2016 Matěj Cepl <mcepl@redhat.com> - 3.4.2-2
 - Switch off build OTR plugin for EL6 (see
   https://bugs.bitlbee.org/ticket/1163 for explanation, and if desired
diff --git a/sources b/sources
index b2fc5cd..b83fdf6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b620bf80c35d673cd08311792ec96be  bitlbee-3.4.2.tar.gz
+SHA512 (bitlbee-3.5.tar.gz) = 7f044474fff5b1213dddc29e19aae102d1bbe4361cddcf9e58f965c01a58b6f7ed41cbf6ecec050a96f91f55dca15f6df948dee105eff001086d9daa15ba0499