diff --git a/mutt/Dockerfile b/mutt/Dockerfile
index b9e39d4..6848585 100644
--- a/mutt/Dockerfile
+++ b/mutt/Dockerfile
@@ -8,7 +8,7 @@
 #	--name mutt \
 #	jess/mutt
 #
-FROM alpine:latest
+FROM alpine:edge
 MAINTAINER Jessica Frazelle <jess@docker.com>
 
 RUN addgroup -g 1000 user \
@@ -18,7 +18,7 @@ RUN apk --update add \
 	ca-certificates \
 	elinks \
 	git \
-	gnupg \
+	gnupg1 \
 	lynx \
 	mutt \
 	mutt-doc \
@@ -30,7 +30,7 @@ ENV BROWSER lynx
 
 USER user
 ENV HOME /home/user
-ENV TERM xterm
+ENV TERM xterm-256color
 RUN mkdir -p $HOME/.mutt/cache/headers $HOME/.mutt/cache/bodies \
 	&& touch $HOME/.mutt/certificates
 
diff --git a/mutt/entrypoint.sh b/mutt/entrypoint.sh
index 5f90b81..ae62c13 100755
--- a/mutt/entrypoint.sh
+++ b/mutt/entrypoint.sh
@@ -38,6 +38,9 @@ if [ -d "$HOME/.gnupg" ]; then
 	# social citizen of the world
 	{
 		echo
+		if [ -f "/etc/Muttrc.gpg.dist" ]; then
+			echo 'source /etc/Muttrc.gpg.dist'
+		fi
 		if [ -f "/usr/share/doc/mutt/samples/gpg.rc" ]; then
 			echo 'source /usr/share/doc/mutt/samples/gpg.rc'
 		fi