diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 6c1b63dfa..d2d88a596 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -120,8 +120,6 @@ target_link_libraries(DAMASK_ENGINE DAMASK_HYDROGENFLUX  )
 target_link_libraries(DAMASK_ENGINE DAMASK_HOMOGENIZATION)
 
 
-
-
 if (FEM)
       add_library(DAMASK_CPFE "CPFEM.f90")
       target_link_libraries(DAMASK_CPFE DAMASK_ENGINE)
@@ -144,8 +142,11 @@ if (SPECTRAL)
                                        "spectral_mech_Basic.f90")
       target_link_libraries(DAMASK_SPECTRAL_MECH DAMASK_SPECTRAL_UTILITY)
 
+      add_library(DAMASK_SPECTRAL_SOLVER "DAMASK_spectral.f90")
+      target_link_libraries(DAMASK_SPECTRAL_SOLVER DAMASK_CPFE         )
+      target_link_libraries(DAMASK_SPECTRAL_SOLVER DAMASK_SPECTRAL_BASE)
+      target_link_libraries(DAMASK_SPECTRAL_SOLVER DAMASK_SPECTRAL_MECH)
+      
       add_executable(DAMASKSpectral.exe DAMASK_spectral.f90)
-      target_link_libraries(DAMASKSpectral.exe DAMASK_CPFE
-                                               DAMASK_SPECTRAL_BASE
-                                               DAMASK_SPECTRAL_MECH)
+      target_link_libraries(DAMASKSpectral.exe DAMASK_SPECTRAL_SOLVER)
 endif(SPECTRAL)
\ No newline at end of file
diff --git a/code/Makefile b/code/Makefile
index a18cbebac..2a9a3deae 100644
--- a/code/Makefile
+++ b/code/Makefile
@@ -33,7 +33,7 @@ LINKERNAME   ?= $(FLINKER)
 HDF5    = /mnt/research/CMM/opt/hdf5
 # 2. Location of External Libraries (missing in the 1.8.12 version)
 LIBZ    = /mnt/research/CMM/opt/hdf5/lib/libz.a
-LIBSZ   = /mnt/research/CMM/opt/hdf5/lib/libsz.a
+LIBSZ   = /mnt/research/CMM/opt/hdf5/lib/libszip.a
 # 3. Set libraries for HDF5 (LIBS: shared lib, LIBZ: external lib)
 HDFLIBS = -I$(HDF5)/include -L$(HDF5)/lib
 HDFLIBZ = -L$(LIBZ) -L$(LIBSZ)
@@ -631,6 +631,12 @@ numerics.o:                    numerics.f90 \
 libs.o:                        libs.f90 \
                                IO.o
 
+damask_hdf5.o:                 damask_hdf5.f90 \
+    			       prec.o \
+			       IO.o
+
+	$(PREFIX) $(COMPILERNAME) $(HDFLIBS) $(HDFLIBZ) -c damask_hdf5.f90 $(SUFFIX) -lm
+
 IO.o:                          IO.f90 \
                                DAMASK_interface.o
 
@@ -660,10 +666,6 @@ DAMASK_interface.o:            spectral_interface.f90 \
 prec.o:                        prec.f90
 	$(PREFIX) $(COMPILERNAME) $(COMPILE) -c prec.f90 $(SUFFIX)
 
-damask_hdf5.o:                 damask_hdf5.f90 \
-                               prec.o \
-                               IO.o
-	$(PREFIX) $(COMPILERNAME) $(HDFLIBS) $(HDFLIBZ) -c damask_hdf5.f90 $(SUFFIX) -lm
 endif
 
 %.o : %.f90
diff --git a/code/quit__genmod.f90 b/code/quit__genmod.f90
index c6b282470..ef0a49bc0 100644
--- a/code/quit__genmod.f90
+++ b/code/quit__genmod.f90
@@ -1,4 +1,4 @@
-        !COMPILER-GENERATED INTERFACE MODULE: Tue Feb 23 16:12:31 2016
+        !COMPILER-GENERATED INTERFACE MODULE: Thu Mar  3 12:28:23 2016
         MODULE QUIT__genmod
           INTERFACE 
             SUBROUTINE QUIT(STOP_ID)