diff --git a/sagemath-gap-hap.patch b/sagemath-gap-hap.patch
index 14b4750..1c8aece 100644
--- a/sagemath-gap-hap.patch
+++ b/sagemath-gap-hap.patch
@@ -1,6 +1,6 @@
 diff -up src/sage/groups/perm_gps/permgroup.py.orig src/sage/groups/perm_gps/permgroup.py
---- src/sage/groups/perm_gps/permgroup.py.orig	2015-10-11 17:56:24.028811706 -0300
-+++ src/sage/groups/perm_gps/permgroup.py	2015-10-11 17:58:26.629816401 -0300
+--- src/sage/groups/perm_gps/permgroup.py.orig	2015-07-26 07:34:43.000000000 -0600
++++ src/sage/groups/perm_gps/permgroup.py	2016-08-11 21:51:51.490143121 -0600
 @@ -136,7 +136,6 @@ from sage.groups.perm_gps.permgroup_elem
  from sage.groups.abelian_gps.abelian_group import AbelianGroup
  from sage.misc.cachefunc import cached_method
@@ -9,45 +9,55 @@ diff -up src/sage/groups/perm_gps/permgroup.py.orig src/sage/groups/perm_gps/per
  from sage.sets.finite_enumerated_set import FiniteEnumeratedSet
  from sage.categories.all import FiniteEnumeratedSets
  from sage.groups.conjugacy_classes import ConjugacyClassGAP
-@@ -181,8 +180,7 @@ def hap_decorator(f):
+@@ -155,7 +154,10 @@ def load_hap():
+     try:
+         gap.load_package("hap")
+     except Exception:
+-        gap.load_package("hap")
++        try:
++            gap.load_package("hap")
++        except Exception:
++            raise RuntimeError("gap-hap package failed to load.")
+ 
+ def hap_decorator(f):
+     """
+@@ -181,8 +183,6 @@ def hap_decorator(f):
      """
      @wraps(f)
      def wrapped(self, n, p=0):
 -        if not is_package_installed('gap_packages'):
 -            raise RuntimeError("You must install the optional gap_packages package.")
-+        raise RuntimeError("gap-hap package not available.")
          load_hap()
          from sage.rings.arith import is_prime
          if not (p == 0 or is_prime(p)):
-@@ -1617,9 +1615,7 @@ class PermutationGroup_generic(group.Fin
+@@ -1617,9 +1617,7 @@ class PermutationGroup_generic(group.Fin
          try:
              return [Integer(n) for n in self._gap_().IdGroup()]
          except RuntimeError:
 -            if not is_package_installed('database_gap'):
 -                raise RuntimeError("You must install the optional database_gap package first.")
 -            raise
-+            raise RuntimeError("gap-hap package not available.")
++            raise RuntimeError("gap-hap package error.")
  
      def id(self):
          """
-@@ -1670,9 +1666,7 @@ class PermutationGroup_generic(group.Fin
+@@ -1670,9 +1668,7 @@ class PermutationGroup_generic(group.Fin
          try:
              return Integer(self._gap_().PrimitiveIdentification())
          except RuntimeError:
 -            if not is_package_installed('database_gap'):
 -                raise RuntimeError("You must install the optional database_gap package first.")
 -            raise
-+            raise RuntimeError("gap-hap package not available.")
++            raise RuntimeError("gap-hap package error.")
  
      def center(self):
          """
-@@ -3959,8 +3953,7 @@ class PermutationGroup_generic(group.Fin
+@@ -3959,8 +3955,6 @@ class PermutationGroup_generic(group.Fin
  
          - David Joyner and Graham Ellis
          """
 -        if not is_package_installed('gap_packages'):
 -            raise RuntimeError("You must install the optional gap_packages package.")
-+        raise RuntimeError("gap-hap package not available.")
          load_hap()
          from sage.rings.arith import is_prime
          if not (p == 0 or is_prime(p)):
diff --git a/sagemath.spec b/sagemath.spec
index 2215f58..2c66dbe 100644
--- a/sagemath.spec
+++ b/sagemath.spec
@@ -52,7 +52,7 @@ Name:		sagemath
 Group:		Applications/Engineering
 Summary:	A free open-source mathematics software system
 Version:	6.8
-Release:	13%{?dist}
+Release:	14%{?dist}
 # The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
 # Additionally, every $files section has a comment with the license name
 # before files with that license
@@ -120,8 +120,7 @@ Patch14:	%{name}-lrslib.patch
 # http://pallini.di.uniroma1.it/
 Patch15:	%{name}-nauty.patch
 
-# gap hap package not (yet) available
-# http://www-gap.mcs.st-and.ac.uk/Packages/hap.html
+# Use system gap hap package
 Patch16:	%{name}-gap-hap.patch
 
 # correct path to Lfunction include
@@ -184,7 +183,10 @@ BuildRequires:	gmp-ecm-devel
 BuildRequires:	gap
 BuildRequires:	GAPDoc
 BuildRequires:	gap-libs
+BuildRequires:	gap-pkg-atlasrep
 BuildRequires:	gap-pkg-ctbllib
+BuildRequires:	gap-pkg-design
+BuildRequires:	gap-pkg-hap
 BuildRequires:	gap-pkg-sonata
 BuildRequires:	gap-pkg-tomlib
 BuildRequires:	gc-devel
@@ -257,7 +259,10 @@ Requires:	firefox
 Requires:	gap
 Requires:	GAPDoc
 Requires:	gap-libs
+Requires:	gap-pkg-atlasrep
 Requires:	gap-pkg-ctbllib
+Requires:	gap-pkg-design
+Requires:	gap-pkg-hap
 Requires:	gap-pkg-sonata
 Requires:	gap-pkg-tomlib
 Requires:	genus2reduction
@@ -1503,6 +1508,10 @@ exit 0
 
 ########################################################################
 %changelog
+* Fri Aug 12 2016 Jerry James <loganjerry@gmail.com> - 6.8-14
+- Rebuild for fflas-ffpack 2.2.2, givaro 4.0.2, and linbox 1.4.2
+- GAP packages atlasrep, design, and hap are now available
+
 * Sat Jul 23 2016 Jerry James <loganjerry@gmail.com> - 6.8-13
 - Rebuild for ntl 9.10.0