diff --git a/build-constraints.yaml b/build-constraints.yaml
index 29c6e133..14b55a5f 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -2969,6 +2969,10 @@ packages:
     "Tung Dao <me@tungdao.com> @tungd":
         - time-locale-vietnamese
 
+    "Tim McGilchrist <timmcgil@gmail.com>  @tmcgilchrist":
+        - riak
+        - airship
+
     # If you stop maintaining a package you can move it here.
     # It will then be disabled if it starts causing problems.
     # See https://github.com/fpco/stackage/issues/1056
@@ -2990,7 +2994,6 @@ packages:
     # this is to prevent us from including them by accident. They can
     # be removed from this list if they are fixed.
     "Unmaintained packages with compilation failures":
-        - riak-protobuf < 0
         - stackage-types < 0
 
      # If you want to make sure a package is removed from stackage,
@@ -3526,7 +3529,6 @@ expected-test-failures:
     - redis-io
     - rethinkdb
     - rethinkdb-client-driver
-    - riak
     - serialport # "The tests need two serial ports as command line arguments" https://github.com/jputcu/serialport/issues/30
     - serversession-backend-redis # redis
     - shake # Needs ghc on $PATH with some installed haskell packages