diff --git a/COMPILE b/COMPILE
index b63ae7f..a211e04 100644
--- a/COMPILE
+++ b/COMPILE
@@ -44,9 +44,11 @@ resulting binary will most likely not run on other computers, though.
 OpenMP
 ------
 
-OpenMP should be switched on for maximum performance, and at runtime
-OMP_NUM_THREADS should be set to the number of hardware threads (not physical
-cores) of the system.
+OpenMP is enabled by default if the selected compiler supports it.
+It can be disabled at configuration time by specifying "--disable-openmp" at the
+configure command line.
+At runtime OMP_NUM_THREADS should be set to the number of hardware threads
+(not physical cores) of the system.
 (Usually this is  already the default setting when OMP_NUM_THREADS is not
 specified.)
 
@@ -65,19 +67,19 @@ Example configure invocations
 =============================
 
 GCC, OpenMP, portable binary:
-CFLAGS="-DMULTIARCH -std=c99 -O3 -ffast-math -fopenmp" ./configure
-
-GCC, no OpenMP, portable binary:
 CFLAGS="-DMULTIARCH -std=c99 -O3 -ffast-math" ./configure
 
+GCC, no OpenMP, portable binary:
+CFLAGS="-DMULTIARCH -std=c99 -O3 -ffast-math" ./configure --disable-openmp
+
 Clang, OpenMP, portable binary:
-CC=clang CFLAGS="-DMULTIARCH -std=c99 -O3 -ffast-math -fopenmp" ./configure
+CC=clang CFLAGS="-DMULTIARCH -std=c99 -O3 -ffast-math" ./configure
 
 Intel C compiler, OpenMP, nonportable binary:
-CC=icc CFLAGS="-std=c99 -O3 -march=native -ffast-math -fopenmp -D__PURE_INTEL_C99_HEADERS__" ./configure
+CC=icc CFLAGS="-std=c99 -O3 -march=native -ffast-math -D__PURE_INTEL_C99_HEADERS__" ./configure
 
-MPI support, nonportable binary:
-CC=mpicc CFLAGS="-DUSE_MPI -std=c99 -O3 -march=native -ffast-math" ./configure
+MPI support, OpenMP, portable binary:
+CC=mpicc CFLAGS="-DUSE_MPI -DMULTIARCH -std=c99 -O3 -ffast-math" ./configure
 
 Additional GCC flags for pedantic warning and debugging:
 
diff --git a/Makefile.am b/Makefile.am
index b172233..f7b33cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ nobase_include_HEADERS = \
   libsharp/sharp_cxx.h
 
 EXTRA_DIST = \
-  runtest.sh
+  runtest.sh fortran/sharp.f90 fortran/test_sharp.f90
 
 check_PROGRAMS = sharp_testsuite
 sharp_testsuite_SOURCES = test/sharp_testsuite.c test/memusage.c test/memusage.h