diff -Nru sks-1.1.3/debian/changelog sks-1.1.3/debian/changelog
--- sks-1.1.3/debian/changelog	2012-10-04 17:44:34.000000000 +0000
+++ sks-1.1.3/debian/changelog	2013-03-24 05:24:30.000000000 +0000
@@ -1,3 +1,24 @@
+sks (1.1.3-2ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/rules: Look for ^.i not ^ii in libdbX.Y-dev packages for
+      BDB_VERSION and assert that we have a value.
+    - debian/sks.postinst: Provide OLD_BDB versions for Ubuntu.
+  * Dropped changes:
+    - Include pagesize and ptree_pagesize in sksconf so that importing a dump
+      won't hang (a similar change was made in Debian).
+
+ -- Logan Rosen <logan@ubuntu.com>  Sun, 24 Mar 2013 01:21:06 -0400
+
+sks (1.1.3-2) unstable; urgency=high
+
+  * add Vcs tags to control file
+  * fix watch file because of upstream move
+  * add Homepage tag to control file
+  * add db parameter to sksconf to fix db build deadlocks (closes: #699848)
+
+ -- Christoph Martin <christoph.martin@uni-mainz.de>  Mon, 11 Mar 2013 16:48:16 +0100
+
 sks (1.1.3-1ubuntu3) quantal; urgency=low
 
   * debian/sks.postinst: LP: #1061769
diff -Nru sks-1.1.3/debian/control sks-1.1.3/debian/control
--- sks-1.1.3/debian/control	2012-07-02 12:34:05.000000000 +0000
+++ sks-1.1.3/debian/control	2013-03-24 05:18:43.000000000 +0000
@@ -6,6 +6,8 @@
 XSBC-Original-Maintainer: Christoph Martin <christoph.martin@uni-mainz.de>
 Uploaders: Fabio M. Di Nitto <fabbione@fabbione.net>
 Build-Depends: ocaml (>= 3.08), camlp4, libdb-dev, debhelper (>= 7.0.50~), zlib1g-dev, libcryptokit-ocaml-dev (>= 1.2-4), ocaml-nox (>= 1.3-4), perl, perl-doc, dh-ocaml (>= 0.9~)
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-sks
+Vcs-Svn: svn://svn.debian.org/pkg-sks/
 
 Package: sks
 Architecture: any
@@ -20,3 +22,4 @@
  This key server implementation uses an efficient and reliable reconciliation
  algorithm to keep the database in sync with other SKS servers.  Additionally
  it can both send and receive PKS style sync emails.
+Homepage: https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Home
diff -Nru sks-1.1.3/debian/debcfg/sksconf sks-1.1.3/debian/debcfg/sksconf
--- sks-1.1.3/debian/debcfg/sksconf	2012-07-02 12:20:45.000000000 +0000
+++ sks-1.1.3/debian/debcfg/sksconf	2013-03-24 05:19:40.000000000 +0000
@@ -31,7 +31,10 @@
 # Runs database statistics calculation on boot (time and cpu expensive)
 #initial_stat:
 
-# BDB Tuning, allows building from a dump without locking-up
-# http://lists.nongnu.org/archive/html/sks-devel/2012-06/msg00120.html
-#pagesize: 128
-#ptree_pagesize: 16
+# bdb's db_tune program suggests a pagesize of 65536 for [K]DB/key. In practice
+# this caused page deadlocks. I found 8K (16) and 16K (32) to be better values
+pagesize:          16
+#
+# The tuner recommended 4096 (8) for the pagesize for PTree/ptree. I have had
+# very good results with 8196
+ptree_pagesize:    16
diff -Nru sks-1.1.3/debian/watch sks-1.1.3/debian/watch
--- sks-1.1.3/debian/watch	2012-06-20 08:41:30.000000000 +0000
+++ sks-1.1.3/debian/watch	2013-03-24 05:18:43.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-opts=downloadurlmangle=s/\/\/code.google.com// http://code.google.com/p/sks-keyserver/downloads/list?can=1 .*/sks-(\d[\d.]*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)
+https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-(\d[\d.]*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)