diff --git a/pkgs/octopus/libxc.nix b/pkgs/octopus/libxc.nix
index a0d84c3..9c20137 100644
--- a/pkgs/octopus/libxc.nix
+++ b/pkgs/octopus/libxc.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, gfortran, perl }:
+{ stdenv, fetchFromGitLab, autoreconfHook, gfortran, perl }:
 
 let
   common = scripts: version: sha256: stdenv.mkDerivation rec {
     inherit version;
     name = "libxc-${version}";
 
-    src = fetchurl {
-      url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz";
+    src = fetchFromGitLab {
+      owner = "libxc";
+      repo = "libxc";
+      rev = version;
       inherit sha256;
     };
 
-    buildInputs = [ gfortran perl ];
+    buildInputs = [ autoreconfHook gfortran perl ];
 
     postPatch = ''
       patchShebangs ${scripts}
@@ -25,6 +27,6 @@ let
   };
 
 in {
-  libxc404 = common "scripts"       "4.0.4" "0j4ics5hkwjs1grivy8762b05fr8in7wswncm8ym65fy7v27kvxj";
-  libxc301 = common "src testsuite" "3.0.1" "1xyac89yx03vm86rvk07ps1d39xss3amw46a1k53mv30mgr94rl3";
+  libxc404 = common "scripts"       "4.0.4" "0h0rqmcsknr4b8ywadmpgfxzczhgfydn1p1qispmz2s97mcg8ws1";
+  libxc301 = common "src testsuite" "3.0.1" "108y6qnnsw7lhsyg25c42ilxy4klvsagnwdjy10xgnnwq9dh667k";
 }
diff --git a/pkgs/octopus/octopus.nix b/pkgs/octopus/octopus.nix
index af6d3f3..043c467 100644
--- a/pkgs/octopus/octopus.nix
+++ b/pkgs/octopus/octopus.nix
@@ -9,21 +9,23 @@
 # nlopt (only provides libnlopt_cxx which requires c++ compiler for linking)
 #
 
-{ stdenv, fetchurl, gfortran, perl, openmpi
-, libxc3, blas, liblapack, gsl, fftw, netcdffortran
-, arpack, libyaml }:
+{ stdenv, fetchFromGitLab, autoreconfHook, gfortran, perl
+, openmpi, libxc3, blas, liblapack, gsl, fftw, netcdffortran, arpack, libyaml }:
 
 let
   common = version: sha256: stdenv.mkDerivation rec {
     inherit version;
     name = "octopus-${version}";
 
-    src = fetchurl {
-      url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
+    src = fetchFromGitLab {
+      owner = "octopus-code";
+      repo = "octopus";
+      rev = version;
       inherit sha256;
     };
 
     buildInputs = [
+      autoreconfHook
       gfortran
       perl
       openmpi
@@ -40,7 +42,7 @@ let
     # Extend netcdf library combo test to include just -lnetcdff
     postPatch = ''
       patchShebangs build
-      sed -i -e 's/in "" -lnetcdf "-lnetcdff -lnetcdf";/in "" -lnetcdf "-lnetcdff -lnetcdf" -lnetcdff;/' configure
+      sed -i -e 's/in "" -lnetcdf "-lnetcdff -lnetcdf";/in "" -lnetcdf "-lnetcdff -lnetcdf" -lnetcdff;/' m4/netcdf.m4
     '';
 
     configureFlags = [
@@ -59,5 +61,5 @@ let
   };
 
 in {
-  octopus72 = common "7.2" "03zzmq72zdnjkhifbmlxs7ig7x6sf6mv8zv9mxhakm9hzwa9yn7m";
+  octopus72 = common "7.2" "04r826vj7sps3pnwkn8axh4jkiqwddy96lbr3ly4x6ph9c9xmvrq";
 }