diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8ef318be587..382fb991fff 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,7 +1,7 @@
 # Template file for 'octave'
 pkgname=octave
 version=4.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="perl gcc-fortran pkg-config gnuplot"
 makedepends="pcre-devel lapack-devel readline-devel libSM-devel libltdl-devel
@@ -13,8 +13,6 @@ homepage="https://gnu.org/software/octave/"
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
 checksum=80c28f6398576b50faca0e602defb9598d6f7308b0903724442c2a35a605333b
 
-export FFLAGS="-fPIC"
-
 # Package build options
 # TODO: some options are still missing, such as java
 build_options="
@@ -74,3 +72,8 @@ makedepends+="
 pre_build() {
 	chmod +x build-aux/mk-opts.pl
 }
+post_build() {
+	# Remove references to hardening -specs.
+	sed -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" \
+		-i src/mkoctfile.cc libinterp/build-env.cc
+}