diff --git a/mathgl.spec b/mathgl.spec
index ce161c3..1b71ebf 100644
--- a/mathgl.spec
+++ b/mathgl.spec
@@ -5,11 +5,9 @@
 %global with_doc 1
 
 %if 0%{?fedora} >= 21
-%if 0%{?fedora} < 26
 %global with_octave 1
 %global octpkg mathgl
 %endif
-%endif
 
 %if 0%{?with_doc}
 %global docs on
@@ -22,7 +20,7 @@
 Name:          mathgl
 Version:       2.3.5
 # .1 from Version go to Release as octave fails with 4 digits in ver string
-Release:       2%{?dist}.1
+Release:       3%{?dist}.1
 Summary:       Cross-platform library for making high-quality scientific graphics
 Summary(de):   Plattformübergreifende Bibliothek für hochwertige wissenschaftliche Graphiken
 Summary(ru):   Библиотека для осуществления высококачественной визуализации данных
@@ -318,6 +316,16 @@ sed -i s,/usr/local/share/mathgl/fonts/,%{_datadir}/%{name}/fonts/, udav/prop_dl
 # Fix octave module version wether we need it or not
 sed -i -e "s,Version:.*,Version: %{version}," lang/DESCRIPTION
 
+%if 0%{?fedora} >= 21 && 0%{?fedora} < 26
+%global mgl_octarch_dir %{_tmppath}/%{name}-%{version}-%{release}.%{_arch}
+%global mgl_octarch_name %{octpkg}-%{version}.tar.gz
+%endif
+%if 0%{?fedora} >= 26
+%global octave_tar_suffix %{octave_host}-%{octave_api}
+%global mgl_octarch_dir %{_builddir}/%{buildsubdir}/build/
+%global mgl_octarch_name %{octpkg}-%{version}-%{octave_tar_suffix}.tar.gz
+%endif
+
 
 %build
 
@@ -387,11 +395,9 @@ rm -r %{buildroot}%{_libdir}/$MPI_COMPILER_NAME/usr
 # Serial
 make install DESTDIR=%{buildroot} -C %{_target_platform}_serial INSTALL="install -p"
 %if 0%{?with_octave}
-pushd lang
-mkdir -p %{_tmppath}/%{name}-%{version}-%{release}.%{_arch}
-cp ../%{_target_platform}_serial/lang/%{octpkg}.tar.gz %{_tmppath}/%{name}-%{version}-%{release}.%{_arch}/%{octpkg}-%{version}.tar.gz
+mkdir -p %{mgl_octarch_dir}
+cp %{_target_platform}_serial/lang/%{octpkg}.tar.gz %{mgl_octarch_dir}/%{mgl_octarch_name}
 %octave_pkg_install
-popd
 %endif
 
 %if 0%{?with_openmpi}
@@ -585,6 +591,9 @@ fi
 %endif
 
 %changelog
+* Tue Jan 24 2017 Dmitrij S. Kryzhevich <kryzhev@ispms.ru> - 2.3.5.1-3
+- Reeanle octave bindings for f26 and above.
+
 * Tue Jan 10 2017 Dmitrij S. Kryzhevich <kryzhev@ispms.ru> - 2.3.5.1-2
 - Disable smp build.