diff --git a/.cvsignore b/.cvsignore
index 371a21e..df59c07 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-subversion-1.1.0.tar.gz
+subversion-1.1.1.tar.gz
diff --git a/sources b/sources
index 649aead..48fb465 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9da8fdd869b218e17101b7675cbbae99  subversion-1.1.0.tar.gz
+30c9c93fb3abda4aada393f2c68a406b  subversion-1.1.1.tar.gz
diff --git a/subversion-1.0.3-pie.patch b/subversion-1.0.3-pie.patch
index f470486..de6152f 100644
--- a/subversion-1.0.3-pie.patch
+++ b/subversion-1.0.3-pie.patch
@@ -1,6 +1,6 @@
 
 Build subversion executables as PIEs. Requires a slight jig to 
-ensure that executables in the test suite are *not* build using
+ensure that executables in the test suite are *not* built using
 -pie, since that doesn't work when main() is not itself an
 object built with -pie. 
 
@@ -25,7 +25,7 @@ object built with -pie.
 +    ### more Makefile-specific stuff:
 +    if self.install == 'test':
 +      self.link_cmd = '$(LINK_TEST_LIB)'
-+    else:
++    elif self.link_cmd == '$(LINK)':
 +      self.link_cmd = '$(LINK_LIB)'
  
  class TargetApacheMod(TargetLib):
@@ -59,3 +59,14 @@ object built with -pie.
  
  # special link rule for mod_dav_svn
  LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module
+--- subversion-1.1.0/build.conf.pie
++++ subversion-1.1.0/build.conf
+@@ -347,7 +347,7 @@
+ sources = swigutil_py.c
+ libs = swig_runtime libsvn_subr libsvn_delta aprutil apriconv apr
+ # need SWIG_LDFLAGS to be able to link swig_runtime
+-link-cmd = $(LINK) $(SWIG_LDFLAGS) $(SWIG_PY_LIBS)
++link-cmd = $(LINK_LIB) $(SWIG_LDFLAGS) $(SWIG_PY_LIBS)
+ install = swig-py-lib
+ # need special build rule to include -DSWIGPYTHON
+ compile-cmd = $(COMPILE_SWIG_PY)
diff --git a/subversion.spec b/subversion.spec
index 75ee071..9e4ee1f 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -5,8 +5,8 @@
 
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
-Version: 1.1.0
-Release: 5
+Version: 1.1.1
+Release: 2
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -190,6 +190,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*::*
 
 %changelog
+* Mon Oct 25 2004 Joe Orton <jorton@redhat.com> 1.1.1-2
+- update to 1.1.1
+- update -pie patch to address #134786
+
 * Mon Oct  4 2004 Joe Orton <jorton@redhat.com> 1.1.0-5
 - use pure_vendor_install to fix Perl modules
 - use %%find_lang to package translations (Axel Thimm)
diff --git a/upstream b/upstream
index 371a21e..df59c07 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-subversion-1.1.0.tar.gz
+subversion-1.1.1.tar.gz