diff --git a/lalframe.changes b/lalframe.changes
index a79dd71..75e5981 100644
--- a/lalframe.changes
+++ b/lalframe.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul  1 23:25:51 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Disable octave support as compilation error with current swig.
+
 -------------------------------------------------------------------
 Mon May 11 15:17:37 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
 
diff --git a/lalframe.spec b/lalframe.spec
index f57a372..a7991be 100644
--- a/lalframe.spec
+++ b/lalframe.spec
@@ -17,6 +17,8 @@
 
 
 %define shlib lib%{name}11
+# FIXME: Disable octave support as compilation error with current swig
+%bcond_with octave
 Name:           lalframe
 Version:        1.5.0
 Release:        0
@@ -38,12 +40,14 @@ BuildRequires:  fdupes
 BuildRequires:  ldas-tools-framecpp-devel
 BuildRequires:  libframe-devel
 BuildRequires:  libtool
-BuildRequires:  octave-devel
-BuildRequires:  octave-lal >= 6.21.0
-BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
 BuildRequires:  swig
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(lal) >= 6.21.0
+%if %{with octave}
+BuildRequires:  octave-lal >= 6.21.0
+BuildRequires:  pkgconfig(octave)
+%endif
 Requires:       python-lal
 Requires:       python-numpy
 %python_subpackages
@@ -91,7 +95,9 @@ export PYTHON=$python
 mkdir ../${PYTHON}_build
 cp -pr ./ ../${PYTHON}_build  
 pushd ../${PYTHON}_build
-%configure --enable-swig
+%configure \
+  %{?with_octave:--enable-swig-octave} \
+  %{!?with_octave:--disable-swig-octave}
 make %{?_smp_mflags}
 popd
 }
@@ -155,11 +161,13 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_mandir}/man1/*.1%{?ext_man}
 %config %{_sysconfdir}/profile.d/%{name}.*
 
+%if %{with octave}
 %files -n octave-%{name}
 %dir %{_libdir}/octave/*/site
 %dir %{_libdir}/octave/*/site/oct
 %dir %{_libdir}/octave/*/site/oct/*
 %{_libdir}/octave/*/site/oct/*/*.oct
+%endif
 
 %files %{python_files}
 %{python_sitearch}/*