=== modified file 'Src/diagg.F'
--- Src/diagg.F	2016-08-30 06:07:55 +0000
+++ Src/diagg.F	2016-09-12 08:56:49 +0000
@@ -179,8 +179,8 @@
      .              psi(1,1,ispin), neigwanted, ierror )
         else if (use_mrrr) then
 #ifdef SIESTA__NO_MRRR
-           call die("MRRR method not compiled-in. Remove 
-     & -DSIESTA__NO_MRRR")
+           call die("MRRR method not compiled-in. " //
+     $              "Remove -DSIESTA__NO_MRRR")
 #else
            call rdiag_mrrr( Haux, Saux, nuotot,
      $              nuo, nuotot, eo(1,ispin), 

=== modified file 'Src/rdiag_mrrr.F'
--- Src/rdiag_mrrr.F	2016-08-30 06:07:55 +0000
+++ Src/rdiag_mrrr.F	2016-09-12 08:50:03 +0000
@@ -313,6 +313,7 @@
       end subroutine rdiag_mrrr
 #else
       ! Some compilers do not allow empty modules
+      CONTAINS
       subroutine rdiag_mrrr_dummy()
       end subroutine
 #endif