diff --git a/CHANGES.md b/CHANGES.md
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+## 0.1.1.7 (2019-03-15)
+
+ * Fix two bugs in `cbits` relating to distribution values
+   ([#35](https://github.com/tibbe/ekg-core/pull/35)).
+ * GHC 8.8 support ([#34](https://github.com/tibbe/ekg-core/pull/34)).
+
 ## 0.1.1.6 (2018-11-19)
 
  * Reverted [#25](https://github.com/tibbe/ekg-core/pull/25), which
diff --git a/cbits/distrib.c b/cbits/distrib.c
--- a/cbits/distrib.c
+++ b/cbits/distrib.c
@@ -35,10 +35,10 @@
   const StgDouble sum_sq_delta = (a->sum_sq_delta + b->sum_sq_delta +
                                   delta * delta * (a->count * b->count) / count);
   a->count = count;
-  a->mean = mean;
+  a->mean = (count == 0) ? 0.0 : mean; // divide-by-zero gives NaN
   a->sum_sq_delta = sum_sq_delta;
   a->sum = a->sum + b->sum;
-  a->min = b->min < a->min ? b->min : a->min;
-  a->max = b->max > a->max ? b->max : a->max;
+  a->min = b->min; // This is slightly hacky, but ok: see
+  a->max = b->max; // 813aa426be78e8abcf1c7cdd43433bcffa07828e
   hs_unlock(&b->lock);
 }
diff --git a/ekg-core.cabal b/ekg-core.cabal
--- a/ekg-core.cabal
+++ b/ekg-core.cabal
@@ -1,6 +1,6 @@
 cabal-version:       1.18
 name:                ekg-core
-version:             0.1.1.6
+version:             0.1.1.7
 synopsis:            Tracking of system metrics
 description:
   This library lets you defined and track system metrics.
@@ -14,9 +14,9 @@
 category:            System
 build-type:          Simple
 extra-source-files:  CHANGES.md
-tested-with:         GHC == 8.6.2, GHC == 8.4.4,  GHC == 8.2.2,
-                     GHC == 8.0.2, GHC == 7.10.3, GHC == 7.8.4,
-                     GHC == 7.6.3
+tested-with:         GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4,
+                     GHC == 8.2.2, GHC == 8.0.2, GHC == 7.10.3,
+                     GHC == 7.8.4, GHC == 7.6.3
 
 library
   exposed-modules:
@@ -34,7 +34,7 @@
 
   build-depends:
     ghc-prim < 0.6,
-    base >= 4.6 && < 4.13,
+    base >= 4.6 && < 4.14,
     containers >= 0.5 && < 0.7,
     text < 1.3,
     unordered-containers < 0.3