diff --git a/Dockerfile b/Dockerfile
index f0fe5966c..20d453a8c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV TOOLCHAIN_FLAVOR=$TOOLCHAIN_FLAVOR
 
 RUN apt-get update && apt-get install -y \
     build-essential wget git libsodium-dev graphviz \
-    valgrind check libssl-dev libusb-1.0-0-dev libudev-dev
+    valgrind check libssl-dev libusb-1.0-0-dev libudev-dev zlib1g-dev
 
 # TODO are all apt packages actually needed?
 
diff --git a/Pipfile.lock b/Pipfile.lock
index 1ab45b8fd..a7ee689d9 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -237,9 +237,9 @@
         },
         "inform": {
             "hashes": [
-                "sha256:15814162c32cb245395234767dc6996e13f32623dbaffd94c22af2eab57644b3"
+                "sha256:9fa86429435552ecba03eeae34fb2864049b16ad59ac888cb125e49f9ad36632"
             ],
-            "version": "==1.15.0"
+            "version": "==1.16.0"
         },
         "isort": {
             "hashes": [
@@ -371,10 +371,10 @@
         },
         "pbr": {
             "hashes": [
-                "sha256:8257baf496c8522437e8a6cfe0f15e00aedc6c0e0e7c9d55eeeeab31e0853843",
-                "sha256:8c361cc353d988e4f5b998555c88098b9d5964c2e11acf7b0d21925a66bb5824"
+                "sha256:6901995b9b686cb90cceba67a0f6d4d14ae003cd59bc12beb61549bdfbe3bc89",
+                "sha256:d950c64aeea5456bbd147468382a5bb77fe692c13c9f00f0219814ce5b642755"
             ],
-            "version": "==5.1.3"
+            "version": "==5.2.0"
         },
         "pep8": {
             "hashes": [
diff --git a/core/build-docker.sh b/core/build-docker.sh
index 2543b645a..0ab5417ba 100755
--- a/core/build-docker.sh
+++ b/core/build-docker.sh
@@ -25,7 +25,7 @@ else
 	REPOSITORY=https://github.com/$REPOSITORY/trezor-firmware.git
 fi
 
-docker build -t $IMAGE --build-arg TOOLCHAIN_FLAVOR=$TOOLCHAIN_FLAVOR core
+docker build -t $IMAGE --build-arg TOOLCHAIN_FLAVOR=$TOOLCHAIN_FLAVOR .
 
 USER=$(ls -lnd . | awk '{ print $3 }')
 GROUP=$(ls -lnd . | awk '{ print $4 }')
diff --git a/shell.nix b/shell.nix
index 00d9ae5ba..efbcd3ddd 100644
--- a/shell.nix
+++ b/shell.nix
@@ -30,10 +30,12 @@ in
       gnumake
       graphviz
       openssl
+      pipenv
       pkgconfig
       protobuf
       python2Packages.demjson
       scons
       valgrind
+      zlib
     ];
   }