diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
index 28ce486984..7813904e74 100644
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@@ -29,8 +29,12 @@ RUN  apk add --no-cache \
     ca-certificates \
     coreutils \
     curl \
-    git
+    git \
+    jq \
+    nano
 
+RUN echo -e "\nYou are now in a development container. Run '\e\033[1mmake help\e\033[0m' to learn about\navailable make targets.\n" > /etc/motd \
+ && echo -e "cat /etc/motd\nPS1=\"\e[0;32m\u@docker-cli-dev\\$ \e[0m\"" >> /root/.bashrc
 CMD bash
 ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
 ENV PATH=$PATH:/go/src/github.com/docker/cli/build