diff --git a/.gitattributes b/.gitattributes
index 8bc6965..e1e127f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -57,16 +57,16 @@ test/BlockTestSpecs.txt -text
 test/H5BlockDissolveGhosts.c -text
 test/H5BlockParTestScalarField.c -text
 test/H5BlockParTestScalarField.pbs -text
-test/H5BlockParTestScalarFieldF.f90 -text
+test/H5BlockParTestScalarFieldF.F90 -text
 test/H5BlockTestAttributes.c -text
-test/H5BlockTestAttributesF.f90 -text
+test/H5BlockTestAttributesF.F90 -text
 test/H5ParallelTest.cc -text
 test/H5PartAndreasTest.cc -text
 test/H5PartTest.cc -text
 test/H5PartTestParallel.cc -text
 test/H5test.cc -text
 test/H5testF.f -text
-test/H5testFpar.f90 -text
+test/H5testFpar.F90 -text
 test/Makefile.am -text
 tools/Makefile.am -text
 tools/README -text
diff --git a/configure.ac b/configure.ac
index b2e3926..8f03407 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,6 +271,10 @@ if test "X$USE_FORTRAN" = "Xyes"; then
 	FFLAGS="${FFLAGS} -fno-second-underscore"
     fi
 
+    if test $FC = "gfortran"; then
+        FFLAGS="${FFLAGS} -DHAVE_GFORTRAN"
+    fi
+
     AC_MSG_CHECKING([symbol convention in object files])
     `cd src && rm -f TestUnderscore.o TestUnderscoreC.o TestUnderscore`
     `cd src && ${FC} ${FFLAGS} -c TestUnderscore.f`
diff --git a/src/H5PartF.c b/src/H5PartF.c
index 0a0f0db..c65e69f 100755
--- a/src/H5PartF.c
+++ b/src/H5PartF.c
@@ -220,7 +220,7 @@ _H5Part_flagsfor2c (
 
 	char fbits = 0x00;
 
-	flags = strtok ( str, "," );
+	flags = strtok ( flags, "," );
 	while ( flags != NULL ) {
 		if ( strcmp ( flags, "vfd_mpiposix" ) == 0 )
 				fbits |= H5PART_VFD_MPIPOSIX;
diff --git a/test/H5BlockParTestScalarFieldF.f90 b/test/H5BlockParTestScalarFieldF.F90
similarity index 99%
rename from test/H5BlockParTestScalarFieldF.f90
rename to test/H5BlockParTestScalarFieldF.F90
index cf646fc..e1b781f 100644
--- a/test/H5BlockParTestScalarFieldF.f90
+++ b/test/H5BlockParTestScalarFieldF.F90
@@ -5,10 +5,12 @@ PROGRAM H5BlockParTestScalarFieldF
    INCLUDE 'H5PartF90.inc'
    INCLUDE 'H5BlockF90.inc'
 
+#ifndef HAVE_GFORTRAN
    INTERFACE
       INTEGER FUNCTION IARGC ()
       END FUNCTION IARGC
    END INTERFACE
+#endif
 
    INTEGER :: myproc = 0
    INTEGER :: nprocs = 1
diff --git a/test/H5BlockTestAttributesF.f90 b/test/H5BlockTestAttributesF.F90
similarity index 100%
rename from test/H5BlockTestAttributesF.f90
rename to test/H5BlockTestAttributesF.F90
diff --git a/test/H5testFpar.f90 b/test/H5testFpar.F90
similarity index 100%
rename from test/H5testFpar.f90
rename to test/H5testFpar.F90
diff --git a/test/Makefile.am b/test/Makefile.am
index 2f897ac..30343f8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -50,9 +50,9 @@ EXTRA_DIST = 	Bench.c \
 		H5PartTest.cc H5PartTestParallel.cc \
 		H5PartAndreasTest.cc \
 		H5test.cc H5testF.f \
-		H5testFpar.f90 \
-		H5BlockParTestScalarField.c H5BlockParTestScalarFieldF.f90 \
-		H5BlockTestAttributes.c H5BlockTestAttributesF.f90 \
+		H5testFpar.F90 \
+		H5BlockParTestScalarField.c H5BlockParTestScalarFieldF.F90 \
+		H5BlockTestAttributes.c H5BlockTestAttributesF.F90 \
 		$(bin_SCRIPTS)
 
 # Specific building instruction (What compilers to use...)
@@ -106,7 +106,7 @@ H5testF.o: H5testF.f
 H5testFpar: H5testFpar.o
 	$(MPIFC)  -o $@ $< $(H5LIB) -lpH5PartF -lpH5Part $(LIBS)
 
-H5testFpar.o: H5testFpar.f90
+H5testFpar.o: H5testFpar.F90
 	$(MPIFC) $(FFLAGS) -c $(H5INC) $<
 
 ###############################################################################
@@ -124,14 +124,14 @@ H5test.o: H5test.cc
 %.o : %.c
 	$(CC) $(CFLAGS) $(INC) -g -c $<
 
-%.o : %.f90
+%.o : %.F90
 	${FC} $(FFLAGS) -c $(H5INC) $<
 
 H5BlockTestAttributes.o: H5BlockTestAttributes.c
 
 H5BlockTestAttributes:	H5BlockTestAttributes.o
 
-H5BlockTestAttributesF.o: H5BlockTestAttributesF.f90
+H5BlockTestAttributesF.o: H5BlockTestAttributesF.F90
 
 H5BlockTestAttributesF:	H5BlockTestAttributesF.o
 	$(FC)  -o $@ $< $(H5LIB) -lH5PartF -lH5Part $(LIBS)
@@ -140,7 +140,7 @@ H5BlockParTestScalarField.o: H5BlockParTestScalarField.c
 
 H5BlockParTestScalarField: H5BlockParTestScalarField.o
 
-H5BlockParTestScalarFieldF.o: H5BlockParTestScalarFieldF.f90
+H5BlockParTestScalarFieldF.o: H5BlockParTestScalarFieldF.F90
 
 H5BlockParTestScalarFieldF: H5BlockParTestScalarFieldF.o
 	$(FC)  -o $@ $< $(H5LIB) -lH5PartF -lH5Part $(LIBS)