diff --git a/auto/lib/conf b/auto/lib/conf
index 6aaa43a..a6242e7 100644
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -66,7 +66,7 @@
     . auto/lib/libgd/conf
 fi
 
-if [ $USE_PERL = YES ]; then
+if [ $USE_PERL != NO ]; then
     . auto/lib/perl/conf
 fi
 
diff --git a/auto/lib/make b/auto/lib/make
index 58a84a3..6298b94 100644
--- a/auto/lib/make
+++ b/auto/lib/make
@@ -27,6 +27,6 @@
     . auto/lib/libatomic/make
 fi
 
-if [ $USE_PERL = YES ]; then
+if [ $USE_PERL != NO ]; then
     . auto/lib/perl/make
 fi
diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf
index 4d1bcf1..f5f5d3e 100644
--- a/auto/lib/perl/conf
+++ b/auto/lib/perl/conf
@@ -60,8 +60,11 @@
                          | sed -e 's/-arch i386//' -e 's/-arch x86_64//'`
     fi
 
-    CORE_LINK="$CORE_LINK $ngx_perl_ldopts"
-    LINK_DEPS="$LINK_DEPS $NGX_OBJS/$ngx_perl_module"
+    if [ $USE_PERL = YES ]; then
+        CORE_LINK="$CORE_LINK $ngx_perl_ldopts"
+    fi
+
+    NGX_LIB_PERL="$ngx_perl_ldopts"
 
     if test -n "$NGX_PERL_MODULES"; then
         have=NGX_PERL_MODULES value="(u_char *) \"$NGX_PERL_MODULES\""
diff --git a/auto/lib/perl/make b/auto/lib/perl/make
index d1c1b9e..8af8902 100644
--- a/auto/lib/perl/make
+++ b/auto/lib/perl/make
@@ -8,7 +8,10 @@
 
 cat << END                                                    >> $NGX_MAKEFILE
 
-$NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.$ngx_perl_dlext: \\
+$NGX_OBJS/src/http/modules/perl/ngx_http_perl_module.o: \\
+		$NGX_OBJS/$ngx_perl_module
+
+$NGX_OBJS/$ngx_perl_module: \\
 		\$(CORE_DEPS) \$(HTTP_DEPS) \\
 		src/http/modules/perl/ngx_http_perl_module.h \\
 		$NGX_OBJS/src/http/modules/perl/Makefile