diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig	2016-08-11 09:33:26.357108127 -0400
+++ src/module_list.py	2016-08-11 09:34:15.543110010 -0400
@@ -12,26 +12,20 @@ SAGE_INC = '/usr/include'
 import pkgconfig
 
 # CBLAS can be one of multiple implementations
-cblas_pc = pkgconfig.parse('cblas')
+cblas_pc = pkgconfig.parse('atlas')
 cblas_libs = list(cblas_pc['libraries'])
 cblas_library_dirs = list(cblas_pc['library_dirs'])
 cblas_include_dirs = list(cblas_pc['include_dirs'])
 
-# TODO: Remove Cygwin hack by installing a suitable cblas.pc
-if os.path.exists('/usr/lib/libblas.dll.a'):
-    cblas_libs = ['gslcblas']
-
-# LAPACK can be one of multiple implementations
-lapack_pc = pkgconfig.parse('lapack')
-lapack_libs = list(lapack_pc['libraries'])
-lapack_library_dirs = list(lapack_pc['library_dirs'])
-lapack_include_dirs = list(lapack_pc['include_dirs'])
+lapack_libs = [ 'lapack' ]
+lapack_library_dirs = []
+lapack_include_dirs = [ SAGE_INC + '/lapack' ]
 
 # GNU Scientific Library
 # Note we replace the built-in gslcblas with the above cblas
 gsl_pc = pkgconfig.parse('gsl')
 gsl_libs = list(gsl_pc['libraries'].difference(['gslcblas']).union(cblas_libs))
-gsl_library_dirs = list(gsl_pc['library_dirs'])
+gsl_library_dirs = list(cblas_pc['library_dirs'])
 gsl_include_dirs = list(gsl_pc['include_dirs'])
 
 # GD image library
diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
--- src/sage/misc/cython.py.orig	2016-08-11 09:33:26.362108127 -0400
+++ src/sage/misc/cython.py	2016-08-11 09:33:29.353108241 -0400
@@ -27,15 +27,11 @@ import pkgconfig
 
 
 # CBLAS can be one of multiple implementations
-cblas_pc = pkgconfig.parse('cblas')
+cblas_pc = pkgconfig.parse('atlas')
 cblas_libs = list(cblas_pc['libraries'])
 cblas_library_dirs = list(cblas_pc['library_dirs'])
 cblas_include_dirs = list(cblas_pc['include_dirs'])
 
-# TODO: Remove Cygwin hack by installing a suitable cblas.pc
-if os.path.exists('/usr/lib/libblas.dll.a'):
-    cblas_libs = 'gslcblas'
-
 standard_libs = [
     'mpfr', 'gmp', 'gmpxx', 'stdc++', 'pari', 'm', 
     'ec', 'gsl',