diff --git a/.gitattributes b/.gitattributes
index 30cb494..1952ce1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,6 +12,7 @@
 /config.guess -text
 /config.h.in -text
 /config.sub -text
+/configure-crayxt -text
 /configure.ac -text
 /depcomp -text
 doc/Doxyfile -text
diff --git a/config.h.in b/config.h.in
index 041c9cb..558ea81 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,32 +1,5 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
 /* "" */
 #undef MY_BUILD_CPU
 
@@ -60,40 +33,12 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Version number of package */
 #undef VERSION
 
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
diff --git a/configure-crayxt b/configure-crayxt
new file mode 100755
index 0000000..ebf9f46
--- /dev/null
+++ b/configure-crayxt
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+ ./configure \
+        $@ \
+        --enable-parallel \
+        --enable-fortran \
+        --enable-tools \
+        CC=cc CXX=CC FC=pgf90 \
+        MPICC=cc MPICXX=CC MPIFC=ftn
+sed -e 's/pgf90/ftn/g' <Makefile > newMakefile
+mv newMakefile Makefile
+sed -e 's/pgf90/ftn/g' <src/Makefile > newMakefile
+mv newMakefile src/Makefile
+sed -e 's/pgf90/ftn/g' <test/Makefile > newMakefile
+mv newMakefile test/Makefile
+sed -e 's/pgf90/ftn/g' <tools/Makefile > newMakefile
+mv newMakefile tools/Makefile
+
diff --git a/configure.ac b/configure.ac
index 6f26ab5..62527db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -511,6 +511,7 @@ if test -n "$ZLIBROOT"; then
 fi
 
 FCFLAGS=${FFLAGS}
+CXXFLAGS=${CFLAGS}
 
 
 ###############################################################################
diff --git a/src/Makefile.am b/src/Makefile.am
index 9dc2428..d7fd142 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,9 +63,6 @@ libH5PartF_a_SOURCES =	$(libH5Part_a_SOURCES) \
 H5PartF.h: H5Part.f90 H5PartAttrib.f90 H5Block.f90 H5BlockReadWrite.f90
 	awk '/INTEGER\*8 FUNCTION/{print "\t" $$1 " " $$3}' $^ >$@
 
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c $<
-
 libpH5Part.a: libH5Part.a
 	$(RM) $@
 	ln -s $^ $@
diff --git a/test/Makefile.am b/test/Makefile.am
index 50de6bc..38077ed 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -23,9 +23,6 @@ test_SOURCES =	test.c \
 
 testf_SOURCES = testf.F90
 
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c $<
-
 clean: clean-am
 	rm -f *.h5
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b8feb78..6cf0cec 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,9 +24,3 @@ homdynToH5p_SOURCES =	homdynToH5p.cc
 H5PartBench_SOURCES =	H5PartBench.c
 H5BlockBench_SOURCES =	H5BlockBench.c
 
-.o.cc:
-	$(CXX) $(CFLAGS) $(INCLUDES) -c $<
-
-.o.c:
-	$(CC) $(CFLAGS) $(INCLUDES) -c $<
-