diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am
index 72901a5..5f65802 100755
--- a/tutorial/Makefile.am
+++ b/tutorial/Makefile.am
@@ -32,14 +32,6 @@
 SUBDIRS += js
 endif
 
-if WITH_PERL
-#SUBDIRS += perl
-endif
-
-if WITH_PHP
-#SUBDIRS += php
-endif
-
 if WITH_PYTHON
 SUBDIRS += py
 SUBDIRS += py.twisted
@@ -50,10 +42,6 @@
 SUBDIRS += rb
 endif
 
-if WITH_HASKELL
-#SUBDIRS += hs
-endif
-
 if WITH_GO
 SUBDIRS += go
 endif
@@ -63,5 +51,19 @@
 #
 all-local:
 	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/tutorial/tutorial.thrift
-
 endif
+
+# Any folders or files not listed above being added to SUBDIR need to be placed here in 
+# EXTRA_DIST to be included in the release 
+EXTRA_DIST = \
+	csharp \
+	d \
+	delphi \
+	erl \
+	gen-html \
+	hs \
+	ocaml \
+	perl \
+	php \
+	shared.thrift \
+	tutorial.thrift
diff --git a/tutorial/go/Makefile.am b/tutorial/go/Makefile.am
index 5df065a..53c3980 100644
--- a/tutorial/go/Makefile.am
+++ b/tutorial/go/Makefile.am
@@ -55,4 +55,7 @@
 	src/client.go \
 	src/handler.go \
 	src/server.go \
-	src/main.go
+	src/main.go \
+	server.crt \
+	server.key
+
diff --git a/tutorial/java/Makefile.am b/tutorial/java/Makefile.am
index 3b2174a..aa8b80c 100755
--- a/tutorial/java/Makefile.am
+++ b/tutorial/java/Makefile.am
@@ -37,4 +37,8 @@
 	$(ANT) $(ANT_FLAGS) tutorialserver
 
 tutorialclient: all
-	$(ANT) $(ANT_FLAGS) tutorialclient
\ No newline at end of file
+	$(ANT) $(ANT_FLAGS) tutorialclient
+
+EXTRA_DIST = \
+	build.xml \
+	src
diff --git a/tutorial/js/Makefile.am b/tutorial/js/Makefile.am
index c174500..3fe0888 100755
--- a/tutorial/js/Makefile.am
+++ b/tutorial/js/Makefile.am
@@ -32,3 +32,8 @@
 
 tutorialserver: all
 	$(ANT) $(ANT_FLAGS) tutorialserver
+
+EXTRA_DIST = \
+	build.xml \
+	src \
+	tutorial.html
diff --git a/tutorial/py.twisted/Makefile.am b/tutorial/py.twisted/Makefile.am
index 3a553eb..c6cbd45 100755
--- a/tutorial/py.twisted/Makefile.am
+++ b/tutorial/py.twisted/Makefile.am
@@ -34,5 +34,6 @@
 	$(RM) -r gen-*
 
 EXTRA_DIST = \
+	PythonClient.py \
 	PythonServer.py \
-	PythonClient.py
+	PythonServer.tac