diff --git a/tutorial/Makefile.am b/tutorial/Makefile.am
index 17a9257..9160ad0 100755
--- a/tutorial/Makefile.am
+++ b/tutorial/Makefile.am
@@ -83,6 +83,10 @@
 SUBDIRS += cl
 endif
 
+if WITH_PERL
+SUBDIRS += perl
+endif
+
 #
 # generate html for ThriftTest.thrift
 #
@@ -104,7 +108,6 @@
 	erl \
 	hs \
 	ocaml \
-	perl \
 	php \
 	shared.thrift \
 	tutorial.thrift \
diff --git a/tutorial/perl/Makefile.am b/tutorial/perl/Makefile.am
new file mode 100755
index 0000000..fe77213
--- /dev/null
+++ b/tutorial/perl/Makefile.am
@@ -0,0 +1,36 @@
+#
+# 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.
+#
+
+gen-perl/tutorial/Calculator.pm gen-perl/shared/SharedService.pm: $(top_srcdir)/tutorial/tutorial.thrift
+	$(THRIFT) --gen perl -r $<
+
+all-local: gen-perl/tutorial/Calculator.pm
+
+tutorialserver: all
+	${PERL} PerlServer.pl
+
+tutorialclient: all
+	${PERL} PerlClient.pl
+
+clean-local:
+	$(RM) -r gen-*
+
+EXTRA_DIST = \
+	PerlServer.pl \
+	PerlClient.pl
diff --git a/tutorial/perl/PerlClient.pl b/tutorial/perl/PerlClient.pl
index 7c23289..5f6a3b2 100644
--- a/tutorial/perl/PerlClient.pl
+++ b/tutorial/perl/PerlClient.pl
@@ -23,7 +23,7 @@
 use warnings;
 
 use lib '../../lib/perl/lib';
-use lib '../gen-perl';
+use lib 'gen-perl';
 
 use Thrift;
 use Thrift::BinaryProtocol;
diff --git a/tutorial/perl/PerlServer.pl b/tutorial/perl/PerlServer.pl
index ee5d936..1512987 100644
--- a/tutorial/perl/PerlServer.pl
+++ b/tutorial/perl/PerlServer.pl
@@ -20,7 +20,8 @@
 #
 
 use strict;
-use lib '../gen-perl';
+use lib '../../lib/perl/lib';
+use lib 'gen-perl';
 use Thrift::Socket;
 use Thrift::Server;
 use Thrift::ServerSocket;