diff --git a/Makefile.am b/Makefile.am
index 6bda5157a8..e6ce1d192f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -135,6 +135,7 @@ java_EXTRA_DIST=                                                             \
   java/src/test/java/com/google/protobuf/field_presence_test.proto           \
   java/src/test/java/com/google/protobuf/lazy_fields_lite.proto              \
   java/src/test/java/com/google/protobuf/lite_equals_and_hash.proto          \
+  java/src/test/java/com/google/protobuf/map_for_proto2_lite_test.proto      \
   java/src/test/java/com/google/protobuf/map_for_proto2_test.proto           \
   java/src/test/java/com/google/protobuf/map_test.proto                      \
   java/src/test/java/com/google/protobuf/multiple_files_test.proto           \
diff --git a/post_process_dist.sh b/post_process_dist.sh
index 7b2e599d59..1a4d704ee5 100755
--- a/post_process_dist.sh
+++ b/post_process_dist.sh
@@ -15,8 +15,8 @@
 #    non-testdata .txt files are converted to Windows-style line endings.
 # 5) Cleans up after itself.
 
-if [ "$1" == "" ]; then
-  echo "USAGE:  $1 DISTFILE" >&2
+if [ "$1" == "" -o "$2" == "" ]; then
+  echo "USAGE:  $0 DISTFILE LANGUAGE" >&2
   exit 1
 fi
 
@@ -28,6 +28,7 @@ fi
 set -ex
 
 BASENAME=`basename $1 .tar.gz`
+LANGUAGE=$2
 
 # Create a directory called "dist", copy the tarball there and unpack it.
 mkdir dist
@@ -45,7 +46,7 @@ cd $BASENAME/vsprojects
 cd ..
 
 # Build the dist again in .tar.gz and .tar.bz2 formats.
-./configure
+./configure DIST_LANG=$LANGUAGE
 make dist-gzip
 make dist-bzip2