diff --git a/Makefile.am b/Makefile.am
index 30108fe5..2bd78220 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ if BUILD_SERVERTEST
 SERVERTEST=servertest
 endif
 
-SUBDIRS = po intl macros src $(PLUGINS) $(SERVERTEST) docs
+SUBDIRS = po intl macros src $(PLUGINS) $(SERVERTEST) docs examples
 
 ## to automatically rebuild aclocal.m4 if any of the macros in
 ## `macros/' change
diff --git a/configure.in b/configure.in
index 54f01797..41d49590 100644
--- a/configure.in
+++ b/configure.in
@@ -118,10 +118,10 @@ AC_ARG_WITH(plugins,
 
 AC_ARG_ENABLE(perl,
 [  --enable-perl           Enable Perl scripting],
-	if test x$withval = xyes; then
+	if test x$enableval = xyes; then
     		want_perl=yes
 	else
-		if test "x$withval" = xno; then
+		if test "x$enableval" = xno; then
 			want_perl=no
 		else
         		want_perl=yes
@@ -426,6 +426,7 @@ src/lib-nongui/Makefile
 src/lib-popt/Makefile
 src/settings/Makefile
 servertest/Makefile
+examples/Makefile
 docs/Makefile
 docs/help/Makefile
 plugins/Makefile
@@ -436,17 +437,11 @@ plugins/proxy/Makefile
 plugins/external/Makefile
 plugins/bot/Makefile
 plugins/sql/Makefile
-plugins/perl/Makefile.PL
+plugins/perl/xs/Makefile.PL
+plugins/perl/Makefile
 stamp.h
 irssi.spec)
 
-dnl ** build actual the Makefile for Perl plugin
-if test "x$want_perl" = "xyes"; then
-	cd plugins/perl
-	$perlpath Makefile.PL
-	cd ../..
-fi
-
 echo
 
 if test "x$GUI_LIBS" != "x"; then