diff --git a/Rakefile b/Rakefile
index 7df5d7ecbf5262df2f6a60af987d7e51530e07bf..af1f147b010444f56346931067f65453d0e65d87 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,4 @@
-require '~/.rake/CdoCdi'
+require 'CdoCdiBuild'
 class CdiBuild < CdoCdiBuild
   def generateTasks
     super
@@ -11,5 +11,5 @@ class CdiBuild < CdoCdiBuild
   end
 end
 
-build = CdiBuild.new('~/.rake_cdi.json')
+build = CdiBuild.new(ENV['HOME']+'/.rake_cdi.json')
 build.generateTasks
diff --git a/src/Makefile.am b/src/Makefile.am
index 0b6c10a706ee01003397568c89a10f20850bda2f..57d0de3ceb543bda23c6313d0ad3b6b175a9d83c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,6 +20,9 @@ if CREATE_ISOC
 endif
 else
   noinst_LTLIBRARIES += libcdi.la
+if CREATE_ISOC
+  noinst_LTLIBRARIES += libcdi_f2003.la
+endif
 endif
 
 
@@ -174,6 +177,9 @@ EXTRA_DIST += \
 
 
 
+libcdi_f2003_la_SOURCES = mo_cdi.f90
+libcdi_f2003_la_LIBADD = libcdi.la
+
 libcdiresunpack_la_SOURCES = \
 	resource_unpack.c
 
@@ -236,9 +242,6 @@ endif
 
 libcdipio_la_LIBADD    = libcdi.la $(PPM_CORE_LIBS) $(YAXT_LIBS) $(MPI_C_LIB)
 
-libcdi_f2003_la_SOURCES = mo_cdi.f90
-libcdi_f2003_la_LIBADD = libcdi.la
-
 #
 #cdilib.c:
 #	$(top_srcdir)/src/make_cdilib $(top_srcdir)/src