diff --git a/configure.ac b/configure.ac
index 50e6896..123c52b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -615,6 +615,8 @@
   tutorial/cpp/Makefile
   tutorial/java/Makefile
   tutorial/js/Makefile
+  tutorial/py/Makefile
+  tutorial/py.twisted/Makefile
 ])
 
 AC_OUTPUT
diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am
index aadc60e..169a2c1 100755
--- a/tutorial/Makefile.am
+++ b/tutorial/Makefile.am
@@ -41,8 +41,8 @@
 endif
 
 if WITH_PYTHON
-#SUBDIRS += py
-#SUBDIRS += py.twisted
+SUBDIRS += py
+SUBDIRS += py.twisted
 endif
 
 if WITH_RUBY
diff --git a/tutorial/py.twisted/Makefile.am b/tutorial/py.twisted/Makefile.am
new file mode 100755
index 0000000..1973000
--- /dev/null
+++ b/tutorial/py.twisted/Makefile.am
@@ -0,0 +1,35 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+THRIFT = $(top_builddir)/compiler/cpp/thrift
+
+gen-py/tutorial/Calculator.py gen-py/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift
+	$(THRIFT) --gen py:twisted -r $<
+
+all-local: gen-py/tutorial/Calculator.py
+
+tutorialserver: all
+	${PYTHON} PythonServer.py
+
+tutorialclient: all
+	${PYTHON} PythonClient.py
+
+EXTRA_DIST = \
+	PythonServer.py \
+	PythonClient.py
diff --git a/tutorial/py.twisted/PythonClient.py b/tutorial/py.twisted/PythonClient.py
index 351c7f2..9e086f0 100755
--- a/tutorial/py.twisted/PythonClient.py
+++ b/tutorial/py.twisted/PythonClient.py
@@ -19,8 +19,9 @@
 # under the License.
 #
 
-import sys
-sys.path.append('../gen-py.twisted')
+import sys, glob
+sys.path.append('gen-py.twisted')
+sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0])
 
 from tutorial import Calculator
 from tutorial.ttypes import *
diff --git a/tutorial/py.twisted/PythonServer.py b/tutorial/py.twisted/PythonServer.py
index 6130b92..f023cac 100755
--- a/tutorial/py.twisted/PythonServer.py
+++ b/tutorial/py.twisted/PythonServer.py
@@ -19,8 +19,9 @@
 # under the License.
 #
 
-import sys
-sys.path.append('../gen-py.twisted')
+import sys, glob
+sys.path.append('gen-py.twisted')
+sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0])
 
 from tutorial import Calculator
 from tutorial.ttypes import *
diff --git a/tutorial/py.twisted/PythonServer.tac b/tutorial/py.twisted/PythonServer.tac
index 11f0f8f..1d0b6c4 100755
--- a/tutorial/py.twisted/PythonServer.tac
+++ b/tutorial/py.twisted/PythonServer.tac
@@ -22,8 +22,9 @@
 from twisted.application import internet, service
 from thrift.transport import TTwisted
 
-import sys
-sys.path.append('../gen-py.twisted')
+import sys, glob
+sys.path.append('gen-py.twisted')
+sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0])
 from tutorial import Calculator
 from tutorial.ttypes import *
 from PythonServer import CalculatorHandler
diff --git a/tutorial/py/Makefile.am b/tutorial/py/Makefile.am
new file mode 100755
index 0000000..a5599e5
--- /dev/null
+++ b/tutorial/py/Makefile.am
@@ -0,0 +1,35 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+THRIFT = $(top_builddir)/compiler/cpp/thrift
+
+gen-py/tutorial/Calculator.py gen-py/shared/SharedService.py: $(top_srcdir)/tutorial/tutorial.thrift
+	$(THRIFT) --gen py -r $<
+
+all-local: gen-py/tutorial/Calculator.py
+
+tutorialserver: all
+	${PYTHON} PythonServer.py
+
+tutorialclient: all
+	${PYTHON} PythonClient.py
+
+EXTRA_DIST = \
+	PythonServer.py \
+	PythonClient.py
diff --git a/tutorial/py/PythonClient.py b/tutorial/py/PythonClient.py
index 916e915..0554ee1 100755
--- a/tutorial/py/PythonClient.py
+++ b/tutorial/py/PythonClient.py
@@ -19,8 +19,9 @@
 # under the License.
 #
 
-import sys
-sys.path.append('../gen-py')
+import sys, glob
+sys.path.append('gen-py')
+sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0])
 
 from tutorial import Calculator
 from tutorial.ttypes import *
diff --git a/tutorial/py/PythonServer.py b/tutorial/py/PythonServer.py
index cf2aab2..014a12e 100755
--- a/tutorial/py/PythonServer.py
+++ b/tutorial/py/PythonServer.py
@@ -19,8 +19,9 @@
 # under the License.
 #
 
-import sys
-sys.path.append('../gen-py')
+import sys, glob
+sys.path.append('gen-py')
+sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0])
 
 from tutorial import Calculator
 from tutorial.ttypes import *