diff --git a/build.conf b/build.conf
index 1f0d2d8..f2847c2 100644
--- a/build.conf
+++ b/build.conf
@@ -204,7 +204,7 @@ manpages = subversion/svnsync/svnsync.1
 description = Subversion Revision Extractor
 type = exe
 path = subversion/svnversion
-libs = libsvn_wc libsvn_subr apriconv apr
+libs = libsvn_wc libsvn_subr libsvn_diff apriconv apr
 install = bin
 manpages = subversion/svnversion/svnversion.1
 
@@ -1219,7 +1219,7 @@ type = exe
 path = subversion/tests/libsvn_client
 sources = mtcc-test.c
 install = test
-libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr
+libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr libsvn_diff apriconv apr
 
 [conflicts-test]
 description = Test libsvn_client conflict resolver
@@ -1270,7 +1270,7 @@ type = exe
 path = subversion/tests/libsvn_ra_local
 sources = ra-local-test.c
 install = test
-libs = libsvn_test libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr
+libs = libsvn_test libsvn_repos libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr
        apriconv apr
 
 # ----------------------------------------------------------------------------
diff --git a/subversion/bindings/swig/perl/native/Makefile.PL.in b/subversion/bindings/swig/perl/native/Makefile.PL.in
index 3b36901..ca6e83a 100644
--- a/subversion/bindings/swig/perl/native/Makefile.PL.in
+++ b/subversion/bindings/swig/perl/native/Makefile.PL.in
@@ -88,11 +88,10 @@ my %config = (
     OBJECT => q/$(O_FILES)/,
     LIBS => [join(' ', $apr_ldflags,
                   (map {"-L$_"} @ldpaths),
-                  @ldmodules, '-lsvn_swig_perl-1',
-                  `$swig -perl -ldflags`)],
-    LDFLAGS => join(' ', (map {"-L$_"} @ldpaths), '@LDFLAGS@ @SWIG_PL_LINK@'),
-    LDDLFLAGS => join(' ', (map {"-L$_"} @ldpaths),
-                      '@LDFLAGS@ @SWIG_PL_LINK@', $Config{lddlflags}),
+                  @ldmodules, '-lsvn_swig_perl-1')],
+    LDFLAGS => join(' ', '@SWIG_PL_LINK@', (map {"-L$_"} @ldpaths)),
+    LDDLFLAGS => join(' ', '@SWIG_PL_LINK@', (map {"-L$_"} @ldpaths),
+                      $Config{lddlflags}),
     test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
 );
 
diff --git a/Makefile.in b/Makefile.in
index 48a14bf..271c0ae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -897,7 +897,7 @@ swig-pl: autogen-swig-pl $(SWIG_PL_DIR)/native/Makefile
 	    fi; \
 	  done; \
 	fi
-	cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)"
+	cd $(SWIG_PL_DIR)/native; $(MAKE)
 
 check-swig-pl: swig-pl swig-pl-lib
 	cd $(SWIG_PL_DIR)/native; $(MAKE) test