--- a/contrib/dockerlib.sh	Thu Dec 03 01:38:21 2015 +0100
+++ b/contrib/dockerlib.sh	Mon Dec 07 17:39:31 2015 +0100
@@ -35,8 +35,8 @@
         # running docker. This is *very likely* to fail at some point.
         echo RUN useradd $DBUILDUSER -u 1000
     else
-        echo RUN groupadd $DBUILDUSER -g `id -g` --non-unique
-        echo RUN useradd $DBUILDUSER -u `id -u` -g $DBUILDUSER --non-unique
+        echo RUN groupadd $DBUILDUSER -g `id -g` -o
+        echo RUN useradd $DBUILDUSER -u `id -u` -g $DBUILDUSER -o
     fi
   ) | $DOCKER build --tag $CONTAINER -
 }