diff --git a/build_pie.patch b/build_pie.patch
index 63b702c..d57c093 100644
--- a/build_pie.patch
+++ b/build_pie.patch
@@ -3,10 +3,10 @@ Date:   Wed Aug 15 18:33:08 CEST 2012
 
     Build and link binaries with PIE flags.
 
-Index: tdb-1.2.12/wscript
+Index: tdb-1.3.6/wscript
 ===================================================================
---- tdb-1.2.12.orig/wscript
-+++ tdb-1.2.12/wscript
+--- tdb-1.3.6.orig/wscript
++++ tdb-1.3.6/wscript
 @@ -150,20 +150,27 @@ def build(bld):
  
          bld.SAMBA_BINARY('tdbrestore',
@@ -36,5 +36,5 @@ Index: tdb-1.2.12/wscript
 +			 cflags='-fPIE', ldflags='-pie',
 +			 manpages='man/tdbtool.8')
  
-         # FIXME: This hardcoded list is stupid, stupid, stupid.
-         bld.SAMBA_SUBSYSTEM('tdb-test-helpers',
+         if bld.env.standalone_tdb:
+             # FIXME: This hardcoded list is stupid, stupid, stupid.
diff --git a/tdb-1.3.4.tar.asc b/tdb-1.3.4.tar.asc
deleted file mode 100644
index 004c4a2..0000000
--- a/tdb-1.3.4.tar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABAgAGBQJUl9MRAAoJEEeTkWETCEAltJ8H/0wk2yj/7i9QhblVP27OSYr/
-YSleQYW1xQdi23yJ4AEfRqecdTIGhUpP+XmpBMvQa27oXwX0lw0KcD6Z2HMX9G//
-0h2VlCW8BEoUwCuqTczGcDRRkgx4mhrGF72JnIxfqL8C1y2nj8uss00fDWyoZFb4
-4mhj//GHA8P2AFJrATcHJqG8n4HZvV9dNKebSp3wwQK4DtpKC5S0Uw4UziVy80h1
-4W26YbRitWr+FOfRx6CR/6wcDSPb/4WNwwHbo3ncwNHtDwElNVOded29UKZiAKvy
-u3XmMj0AgZbPeXEFH5clg8qcoHU6EJmlsA1SDpI55WI3AYvqM9H2HOqJkP5cMwE=
-=iwgL
------END PGP SIGNATURE-----
diff --git a/tdb-1.3.4.tar.gz b/tdb-1.3.4.tar.gz
deleted file mode 100644
index 61208f5..0000000
--- a/tdb-1.3.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f585cd53b49cb1f11f4c5aec404d0daa0c9bc5568790b09f5eb3b79315511729
-size 483140
diff --git a/tdb-1.3.6.tar.asc b/tdb-1.3.6.tar.asc
new file mode 100644
index 0000000..0b62784
--- /dev/null
+++ b/tdb-1.3.6.tar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJVe4D5AAoJEEeTkWETCEAlc2MH/18d3dtsFNnT07m3wsYQoOpD
+qCQkVuBlCM6f8pCA+/mk/eqCzzLOlg8w3TseP2yS/18jCYFfVA49Q79dRgzsYine
+t9BzLazkztQx4Et1NnLH+4Nx8AunG31H8ydTH+oge8FXQFnDXtXuewOS870iEu2V
+L0mClmFSj/Dsa6RqDhHFtTUVexxCqfNilN6lMu120OG0r5nlzYV9VPZNaKJWaSla
+Op7ZwNMaNTMV641iUjJgpaTw9Ko28FPTZ/j4mWjvXNSn/duaqYRVtmfG3Gk+j5AS
+Ls7LgOZQzxhlzW6lUqcEQT6x8ZpAUs+IfoxuBiZrUS1+XZJBNmiQUiaTMVQRqLM=
+=xSy8
+-----END PGP SIGNATURE-----
diff --git a/tdb-1.3.6.tar.gz b/tdb-1.3.6.tar.gz
new file mode 100644
index 0000000..f6d3d45
--- /dev/null
+++ b/tdb-1.3.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85d7dd247e58d8b303de542a2bc39a3dff9e5f54dea39a94c1c910cee25a59a5
+size 490881
diff --git a/tdb.changes b/tdb.changes
index fd024de..6a578da 100644
--- a/tdb.changes
+++ b/tdb.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sat Jun 27 16:53:13 UTC 2015 - lmuelle@suse.com
+
+- Update to version 1.3.6.
+  + Fix runtime detection for robust mutexes in the standalone build;
+    (bso#11326).
+  + Possible fix for the build with robust mutexes on solaris 11; (bso#11319).
+- Update to version 1.3.5.
+  + ABI change: tdb_chainlock_read_nonblock() has been added, a nonblock
+    variant of tdb_chainlock_read()
+  + Do not build test binaries if it's not a standalone build
+  + Fix CID 1034842 Resource leak
+  + Fix CID 1034841 Resource leak
+  + don't let tdb_wrap_open() segfault with name==NULL
+
 -------------------------------------------------------------------
 Tue Jan 13 14:50:54 UTC 2015 - lmuelle@suse.com
 
diff --git a/tdb.spec b/tdb.spec
index 560fe26..2e4081c 100644
--- a/tdb.spec
+++ b/tdb.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tdb
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,7 +34,7 @@ BuildRequires:  pkgconfig
 %endif
 BuildRequires:  python-devel
 Url:            http://tdb.samba.org/
-Version:        1.3.4
+Version:        1.3.6
 Release:        0
 Summary:        Samba Trivial Database
 License:        GPL-3.0+