diff --git a/lhapdf.spec b/lhapdf.spec
index 16686ad..cc9fddd 100644
--- a/lhapdf.spec
+++ b/lhapdf.spec
@@ -1,15 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
-# Disable octave for EPEL 7 - not yet available
-%if %{?rhel}%{!?rhel:0} >= 7
-%global octave 0
-%else
-%global octave 1
-%endif
-
 Name:		lhapdf
 Version:	5.9.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Les Houches Accord PDF Interface
 Group:		System Environment/Libraries
 
@@ -34,9 +27,7 @@ Patch2:		%{name}-fix-typo.patch
 Patch3:		%{name}-path-max.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %{octave}
 BuildRequires:	octave-devel
-%endif
 BuildRequires:	ncurses-devel
 BuildRequires:	python-devel
 BuildRequires:	gcc-gfortran
@@ -62,7 +53,6 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 %description devel
 This package provides development files of LHAPDF, including C++ bindings.
 
-%if %{octave}
 %global octpkg %{name}
 %{!?octave_api: %global octave_api %(octave-config -p API_VERSION || echo 0)}
 %{!?octpkgdir: %global octpkgdir %{_datadir}/octave/packages/%{octpkg}-%{version}}
@@ -79,7 +69,6 @@ Requires(postun):	octave
 
 %description -n octave-%{name}
 This package provides Octave bindings for LHAPDF.
-%endif
 
 %package -n python-%{name}
 Summary:	Les Houches Accord PDF Interface - Python module
@@ -136,11 +125,7 @@ rm pyext/lhapdf.py
 %endif
 
 %build
-%if %{octave}
 %configure --disable-static --enable-octave
-%else
-%configure --disable-static --disable-octave
-%endif
 
 # Reduce overlinking
 sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -159,7 +144,6 @@ install -m 644 -p %SOURCE9 %{buildroot}%{_mandir}/man1
 rm %{buildroot}%{_libdir}/libLHAPDF.la
 rm %{buildroot}%{_datadir}/%{name}/doc/html
 
-%if %{octave}
 APIDIR=$(octave-config -p CANONICAL_HOST_TYPE)-$(octave-config -p API_VERSION)
 mkdir -p %{buildroot}%{octpkglibdir}/${APIDIR}
 mv %{buildroot}%{_datadir}/%{name}/%{name}.oct \
@@ -185,7 +169,6 @@ EOF
 
 sed '2a pkg load lhapdf' octave/lhapdf-octave-example1.m \
   > lhapdf-octave-example1.m
-%endif
 
 mkdir -p %{buildroot}%{_datadir}/%{name}/PDFsets
 install -m 644 -p PDFsets/* %{buildroot}%{_datadir}/%{name}/PDFsets
@@ -202,13 +185,11 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%if %{octave}
 %post -n octave-%{name}
 %octave_cmd pkg rebuild
 
 %postun -n octave-%{name}
 %octave_cmd pkg rebuild
-%endif
 
 %files
 %{_libdir}/libLHAPDF.so.*
@@ -221,12 +202,10 @@ rm -rf %{buildroot}
 %{_libdir}/libLHAPDF.so
 %doc examples/CC*.cc examples/Example*.f
 
-%if %{octave}
 %files -n octave-%{name}
 %{octpkglibdir}
 %{octpkgdir}
 %doc lhapdf-octave-example1.m
-%endif
 
 %files -n python-%{name}
 %{_bindir}/lhapdf-getdata
@@ -245,6 +224,9 @@ rm -rf %{buildroot}
 %doc ccwrap/doxy/html COPYING
 
 %changelog
+* Sun Oct 12 2014 Mattias Ellert <mattias.ellert@fysast.uu.se> - 5.9.1-8
+- Re-enable octave for EPEL 7
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.9.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild