diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 6b9592bda7319ceee3963e3e5f3202d2ca4897b9..4f0e5c596d37beee0eca3e737021133c29b3183b 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-05  Andreas Tobler  <a.tobler@schweiz.org>
+
+	* testsuite/libgomp.fortran/fortran.exp: Add flags in case of shared
+	only build.
+
 2009-08-04  David Daney  <ddaney@caviumnetworks.com>
 
 	* config/linux/mutex.h (gomp_mutex_unlock): Add comment about
diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp
index 3d6615ffee7a924aab68e7cc13d82dc65b903722..acbfe49e5e31c464e3365de16e04a94d4ecea936 100644
--- a/libgomp/testsuite/libgomp.fortran/fortran.exp
+++ b/libgomp/testsuite/libgomp.fortran/fortran.exp
@@ -1,16 +1,25 @@
+load_lib libgomp-dg.exp
+
+global shlib_ext
+
+set shlib_ext [get_shlib_extension]
 set lang_library_path	"../libgfortran/.libs"
 set lang_link_flags	"-lgfortran"
 set lang_test_file_found 0
 
-load_lib libgomp-dg.exp
 
 # Initialize dg.
 dg-init
 
 if { $blddir != "" } {
+    # Look for a static libgfortran first.
     if [file exists "${blddir}/${lang_library_path}/libgfortran.a"] {
         set lang_test_file "${lang_library_path}/libgfortran.a"
         set lang_test_file_found 1
+	# We may have a shared only build, so look for a shared libgfortran.
+    } elseif [file exists "${blddir}/${lang_library_path}/libgfortran.${shlib_ext}"] {
+        set lang_test_file "${lang_library_path}/libgfortran.${shlib_ext}"
+        set lang_test_file_found 1
     } else {
         puts "No libgfortran library found, will not execute fortran tests"
     }